diff --git a/packages/advanced-logic/package.json b/packages/advanced-logic/package.json index ea5750f591..01cd783e2d 100644 --- a/packages/advanced-logic/package.json +++ b/packages/advanced-logic/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/advanced-logic", "version": "0.36.0", + "type": "module", "publishConfig": { "access": "public" }, diff --git a/packages/advanced-logic/src/advanced-logic.ts b/packages/advanced-logic/src/advanced-logic.ts index 11ab59010e..4c6e6242d8 100644 --- a/packages/advanced-logic/src/advanced-logic.ts +++ b/packages/advanced-logic/src/advanced-logic.ts @@ -12,25 +12,25 @@ import { isSameChain, } from '@requestnetwork/currency'; -import ContentData from './extensions/content-data'; -import AddressBasedBtc from './extensions/payment-network/bitcoin/mainnet-address-based'; -import AddressBasedTestnetBtc from './extensions/payment-network/bitcoin/testnet-address-based'; -import Declarative from './extensions/payment-network/declarative'; -import AddressBasedErc20 from './extensions/payment-network/erc20/address-based'; -import FeeProxyContractErc20 from './extensions/payment-network/erc20/fee-proxy-contract'; -import ProxyContractErc20 from './extensions/payment-network/erc20/proxy-contract'; -import Erc777Stream from './extensions/payment-network/erc777/stream'; -import FeeProxyContractEth from './extensions/payment-network/ethereum/fee-proxy-contract'; -import EthereumInputData from './extensions/payment-network/ethereum/input-data'; -import NearNative from './extensions/payment-network/near/near-native'; -import NearTestnetNative from './extensions/payment-network/near/near-testnet-native'; -import AnyToErc20Proxy from './extensions/payment-network/any-to-erc20-proxy'; -import AnyToEthProxy from './extensions/payment-network/any-to-eth-proxy'; -import AnyToNear from './extensions/payment-network/near/any-to-near'; -import AnyToNearTestnet from './extensions/payment-network/near/any-to-near-testnet'; -import NativeToken from './extensions/payment-network/native-token'; -import AnyToNative from './extensions/payment-network/any-to-native'; -import Erc20TransferableReceivablePaymentNetwork from './extensions/payment-network/erc20/transferable-receivable'; +import ContentData from './extensions/content-data.js'; +import AddressBasedBtc from './extensions/payment-network/bitcoin/mainnet-address-based.js'; +import AddressBasedTestnetBtc from './extensions/payment-network/bitcoin/testnet-address-based.js'; +import Declarative from './extensions/payment-network/declarative.js'; +import AddressBasedErc20 from './extensions/payment-network/erc20/address-based.js'; +import FeeProxyContractErc20 from './extensions/payment-network/erc20/fee-proxy-contract.js'; +import ProxyContractErc20 from './extensions/payment-network/erc20/proxy-contract.js'; +import Erc777Stream from './extensions/payment-network/erc777/stream.js'; +import FeeProxyContractEth from './extensions/payment-network/ethereum/fee-proxy-contract.js'; +import EthereumInputData from './extensions/payment-network/ethereum/input-data.js'; +import NearNative from './extensions/payment-network/near/near-native.js'; +import NearTestnetNative from './extensions/payment-network/near/near-testnet-native.js'; +import AnyToErc20Proxy from './extensions/payment-network/any-to-erc20-proxy.js'; +import AnyToEthProxy from './extensions/payment-network/any-to-eth-proxy.js'; +import AnyToNear from './extensions/payment-network/near/any-to-near.js'; +import AnyToNearTestnet from './extensions/payment-network/near/any-to-near-testnet.js'; +import NativeToken from './extensions/payment-network/native-token.js'; +import AnyToNative from './extensions/payment-network/any-to-native.js'; +import Erc20TransferableReceivablePaymentNetwork from './extensions/payment-network/erc20/transferable-receivable.js'; /** * Module to manage Advanced logic extensions diff --git a/packages/advanced-logic/src/extensions/content-data.ts b/packages/advanced-logic/src/extensions/content-data.ts index 5c9bab5d96..77be39ccf1 100644 --- a/packages/advanced-logic/src/extensions/content-data.ts +++ b/packages/advanced-logic/src/extensions/content-data.ts @@ -1,5 +1,5 @@ import { ExtensionTypes } from '@requestnetwork/types'; -import { AbstractExtension } from './abstract-extension'; +import { AbstractExtension } from './abstract-extension.js'; const CURRENT_VERSION = '0.1.0'; diff --git a/packages/advanced-logic/src/extensions/payment-network/address-based.ts b/packages/advanced-logic/src/extensions/payment-network/address-based.ts index 97454413ce..36f07930b6 100644 --- a/packages/advanced-logic/src/extensions/payment-network/address-based.ts +++ b/packages/advanced-logic/src/extensions/payment-network/address-based.ts @@ -6,7 +6,7 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; import { areEqualIdentities, deepCopy } from '@requestnetwork/utils'; -import DeclarativePaymentNetwork from './declarative'; +import DeclarativePaymentNetwork from './declarative.js'; /** * Core of the address based payment networks 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 index 5adf9eb140..e3de57916f 100644 --- 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 @@ -4,7 +4,7 @@ import { UnsupportedCurrencyError, } from '@requestnetwork/currency'; import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import Erc20FeeProxyPaymentNetwork from './erc20/fee-proxy-contract'; +import Erc20FeeProxyPaymentNetwork from './erc20/fee-proxy-contract.js'; const CURRENT_VERSION = '0.1.0'; 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 index 5917f6b5ff..ea77a1391c 100644 --- 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 @@ -1,6 +1,6 @@ import { ICurrencyManager, UnsupportedCurrencyError } from '@requestnetwork/currency'; import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import EthereumFeeProxyPaymentNetwork from './ethereum/fee-proxy-contract'; +import EthereumFeeProxyPaymentNetwork from './ethereum/fee-proxy-contract.js'; const CURRENT_VERSION = '0.2.0'; 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 index a7a6bc0587..0294fa728e 100644 --- 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,6 +1,6 @@ -import { FeeReferenceBasedPaymentNetwork } from './fee-reference-based'; +import { FeeReferenceBasedPaymentNetwork } from './fee-reference-based.js'; import { CurrencyTypes, ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { InvalidPaymentAddressError, UnsupportedNetworkError } from './address-based'; +import { InvalidPaymentAddressError, UnsupportedNetworkError } from './address-based.js'; export default abstract class AnyToNativeTokenPaymentNetwork extends FeeReferenceBasedPaymentNetwork { protected constructor( 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 index 3907e9d49a..3c608909fd 100644 --- 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,5 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import AddressBasedPaymentNetwork from '../address-based'; +import AddressBasedPaymentNetwork from '../address-based.js'; const CURRENT_VERSION = '0.1.0'; const BITCOIN_NETWORK = 'mainnet'; 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 index f0636d9809..f3beb1719e 100644 --- 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,4 +1,4 @@ -import BitcoinAddressBasedPaymentNetwork from './mainnet-address-based'; +import BitcoinAddressBasedPaymentNetwork from './mainnet-address-based.js'; import { ExtensionTypes } from '@requestnetwork/types'; const BITCOIN_NETWORK = 'testnet'; diff --git a/packages/advanced-logic/src/extensions/payment-network/declarative.ts b/packages/advanced-logic/src/extensions/payment-network/declarative.ts index 634f21cc7a..263a715cca 100644 --- a/packages/advanced-logic/src/extensions/payment-network/declarative.ts +++ b/packages/advanced-logic/src/extensions/payment-network/declarative.ts @@ -1,6 +1,6 @@ import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; import { addAmount, areEqualIdentities, deepCopy, isValidAmount } from '@requestnetwork/utils'; -import { AbstractExtension } from '../abstract-extension'; +import { AbstractExtension } from '../abstract-extension.js'; const CURRENT_VERSION = '0.1.0'; 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 index e2fcca70c5..7eb0a70e42 100644 --- 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,5 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import AddressBasedPaymentNetwork from '../address-based'; +import AddressBasedPaymentNetwork from '../address-based.js'; const CURRENT_VERSION = '0.1.0'; 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 index bf4780b073..dac65fa904 100644 --- 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,7 +1,7 @@ import { CurrencyTypes, ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; import { NearChains, isSameChain } from '@requestnetwork/currency'; -import { UnsupportedNetworkError } from '../address-based'; -import { FeeReferenceBasedPaymentNetwork } from '../fee-reference-based'; +import { UnsupportedNetworkError } from '../address-based.js'; +import { FeeReferenceBasedPaymentNetwork } from '../fee-reference-based.js'; const EVM_CURRENT_VERSION = '0.2.0'; const NEAR_CURRENT_VERSION = 'NEAR-0.1.0'; 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 index 63aa185392..231285bcf5 100644 --- 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,5 +1,5 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import ReferenceBasedPaymentNetwork from '../reference-based'; +import ReferenceBasedPaymentNetwork from '../reference-based.js'; const CURRENT_VERSION = '0.1.0'; 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 index 50b7171b1b..9e6f8cccf8 100644 --- 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,5 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { FeeReferenceBasedPaymentNetwork } from '../fee-reference-based'; +import { FeeReferenceBasedPaymentNetwork } from '../fee-reference-based.js'; const CURRENT_VERSION = '0.2.0'; diff --git a/packages/advanced-logic/src/extensions/payment-network/erc777/stream.ts b/packages/advanced-logic/src/extensions/payment-network/erc777/stream.ts index 1b8e2da50e..4732d96137 100644 --- a/packages/advanced-logic/src/extensions/payment-network/erc777/stream.ts +++ b/packages/advanced-logic/src/extensions/payment-network/erc777/stream.ts @@ -1,5 +1,5 @@ import { ExtensionTypes, RequestLogicTypes, TypesUtils } from '@requestnetwork/types'; -import ReferenceBasedPaymentNetwork from '../reference-based'; +import ReferenceBasedPaymentNetwork from '../reference-based.js'; import { isValidAmount } from '@requestnetwork/utils'; const CURRENT_VERSION = '0.1.0'; 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 index cda2443463..ec0b4e30b7 100644 --- 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,5 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { FeeReferenceBasedPaymentNetwork } from '../fee-reference-based'; +import { FeeReferenceBasedPaymentNetwork } from '../fee-reference-based.js'; const CURRENT_VERSION = '0.2.0'; 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 index fb83b250e1..7f6bd6abd5 100644 --- 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,5 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import ReferenceBasedPaymentNetwork from '../reference-based'; +import ReferenceBasedPaymentNetwork from '../reference-based.js'; const CURRENT_VERSION = '0.3.0'; 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 index 132f264ff0..1ecb6baa87 100644 --- 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,5 +1,5 @@ import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; -import ReferenceBasedPaymentNetwork from './reference-based'; +import ReferenceBasedPaymentNetwork from './reference-based.js'; import { areEqualIdentities, deepCopy, isValidAmount } from '@requestnetwork/utils'; /** diff --git a/packages/advanced-logic/src/extensions/payment-network/native-token.ts b/packages/advanced-logic/src/extensions/payment-network/native-token.ts index 13c0def2c6..63610e74ee 100644 --- a/packages/advanced-logic/src/extensions/payment-network/native-token.ts +++ b/packages/advanced-logic/src/extensions/payment-network/native-token.ts @@ -1,7 +1,7 @@ import { CurrencyTypes, ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { InvalidPaymentAddressError, UnsupportedNetworkError } from './address-based'; +import { InvalidPaymentAddressError, UnsupportedNetworkError } from './address-based.js'; -import ReferenceBasedPaymentNetwork from './reference-based'; +import ReferenceBasedPaymentNetwork from './reference-based.js'; /** * Implementation of the payment network to pay in ETH based on input data. diff --git a/packages/advanced-logic/src/extensions/payment-network/near/any-to-near-testnet.ts b/packages/advanced-logic/src/extensions/payment-network/near/any-to-near-testnet.ts index 0c848ea398..bb9755c266 100644 --- a/packages/advanced-logic/src/extensions/payment-network/near/any-to-near-testnet.ts +++ b/packages/advanced-logic/src/extensions/payment-network/near/any-to-near-testnet.ts @@ -1,5 +1,5 @@ import { ICurrencyManager } from '@requestnetwork/currency'; -import AnyToNearPaymentNetwork from './any-to-near'; +import AnyToNearPaymentNetwork from './any-to-near.js'; export default class AnyToNearTestnetPaymentNetwork extends AnyToNearPaymentNetwork { public constructor(currencyManager: ICurrencyManager) { 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 index 5b0b802067..a75f4c7799 100644 --- 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 @@ -5,7 +5,7 @@ import { IdentityTypes, RequestLogicTypes, } from '@requestnetwork/types'; -import AnyToNativeTokenPaymentNetwork from '../any-to-native'; +import AnyToNativeTokenPaymentNetwork from '../any-to-native.js'; const CURRENT_VERSION = '0.1.0'; diff --git a/packages/advanced-logic/src/extensions/payment-network/near/near-native.ts b/packages/advanced-logic/src/extensions/payment-network/near/near-native.ts index 4584b99b27..c502745389 100644 --- a/packages/advanced-logic/src/extensions/payment-network/near/near-native.ts +++ b/packages/advanced-logic/src/extensions/payment-network/near/near-native.ts @@ -1,5 +1,5 @@ import { CurrencyTypes, ExtensionTypes } from '@requestnetwork/types'; -import NativeTokenPaymentNetwork from '../native-token'; +import NativeTokenPaymentNetwork from '../native-token.js'; const CURRENT_VERSION = '0.2.0'; diff --git a/packages/advanced-logic/src/extensions/payment-network/near/near-testnet-native.ts b/packages/advanced-logic/src/extensions/payment-network/near/near-testnet-native.ts index 79d8220c58..47312a3ce6 100644 --- a/packages/advanced-logic/src/extensions/payment-network/near/near-testnet-native.ts +++ b/packages/advanced-logic/src/extensions/payment-network/near/near-testnet-native.ts @@ -1,4 +1,4 @@ -import NearNativePaymentNetwork from './near-native'; +import NearNativePaymentNetwork from './near-native.js'; /** * Implementation of the payment network to pay in Near on testnet based on input data. diff --git a/packages/advanced-logic/src/extensions/payment-network/reference-based.ts b/packages/advanced-logic/src/extensions/payment-network/reference-based.ts index 6158f0d5a2..fc7bebd656 100644 --- a/packages/advanced-logic/src/extensions/payment-network/reference-based.ts +++ b/packages/advanced-logic/src/extensions/payment-network/reference-based.ts @@ -1,5 +1,5 @@ import { ExtensionTypes } from '@requestnetwork/types'; -import AddressBasedPaymentNetwork from './address-based'; +import AddressBasedPaymentNetwork from './address-based.js'; // Regex for "at least 16 hexadecimal numbers". Used to validate the salt const eightHexRegex = /[0-9a-f]{16,}/; diff --git a/packages/advanced-logic/src/index.ts b/packages/advanced-logic/src/index.ts index 3ff063d3d9..b0e4ccdd90 100644 --- a/packages/advanced-logic/src/index.ts +++ b/packages/advanced-logic/src/index.ts @@ -1 +1 @@ -export { default as AdvancedLogic } from './advanced-logic'; +export { default as AdvancedLogic } from './advanced-logic.js'; diff --git a/packages/advanced-logic/test/advanced-logic.test.ts b/packages/advanced-logic/test/advanced-logic.test.ts index 53cba4d377..4b6315cd8f 100644 --- a/packages/advanced-logic/test/advanced-logic.test.ts +++ b/packages/advanced-logic/test/advanced-logic.test.ts @@ -1,14 +1,14 @@ import { AdvancedLogicTypes, ExtensionTypes } from '@requestnetwork/types'; -import * as DataBTCCreate from './utils/payment-network/bitcoin/generator-data-create'; -import * as DataDeclarativeCreate from './utils/payment-network/any/generator-data-create'; -import * as DataTestnetBTCCreate from './utils/payment-network/bitcoin/testnet-generator-data-create'; +import * as DataBTCCreate from './utils/payment-network/bitcoin/generator-data-create.js'; +import * as DataDeclarativeCreate from './utils/payment-network/any/generator-data-create.js'; +import * as DataTestnetBTCCreate from './utils/payment-network/bitcoin/testnet-generator-data-create.js'; import { deepCopy } from '@requestnetwork/utils'; -import { AdvancedLogic } from '../src/index'; +import { AdvancedLogic } from '../src/index.js'; -import * as TestData from './utils/test-data-generator'; +import * as TestData from './utils/test-data-generator.js'; let advancedLogic: AdvancedLogicTypes.IAdvancedLogic; diff --git a/packages/advanced-logic/test/extensions/content-data.test.ts b/packages/advanced-logic/test/extensions/content-data.test.ts index a23d9629d0..950a3d481d 100644 --- a/packages/advanced-logic/test/extensions/content-data.test.ts +++ b/packages/advanced-logic/test/extensions/content-data.test.ts @@ -1,9 +1,9 @@ import { ExtensionTypes } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import ContentData from '../../src/extensions/content-data'; +import ContentData from '../../src/extensions/content-data.js'; -import * as TestData from '../utils/test-data-generator'; +import * as TestData from '../utils/test-data-generator.js'; const contentData = new ContentData(); diff --git a/packages/advanced-logic/test/extensions/payment-network/address-based.test.ts b/packages/advanced-logic/test/extensions/payment-network/address-based.test.ts index 7b04f15ad8..afd9d52b4c 100644 --- a/packages/advanced-logic/test/extensions/payment-network/address-based.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/address-based.test.ts @@ -1,6 +1,6 @@ import { UnsupportedCurrencyError } from '@requestnetwork/currency'; import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import AddressBasedPaymentNetwork from '../../../src/extensions/payment-network/address-based'; +import AddressBasedPaymentNetwork from '../../../src/extensions/payment-network/address-based.js'; describe('extensions/payment-network/address-based', () => { it('address validation should throw when using unsupported currency type', () => { diff --git a/packages/advanced-logic/test/extensions/payment-network/any-to-erc20-proxy.test.ts b/packages/advanced-logic/test/extensions/payment-network/any-to-erc20-proxy.test.ts index cda4dcd4b7..9b08211260 100644 --- a/packages/advanced-logic/test/extensions/payment-network/any-to-erc20-proxy.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/any-to-erc20-proxy.test.ts @@ -2,10 +2,10 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; import { CurrencyManager, UnsupportedCurrencyError } from '@requestnetwork/currency'; -import AnyToErc20Proxy from '../../../src/extensions/payment-network/any-to-erc20-proxy'; -import * as DataConversionERC20FeeAddData from '../../utils/payment-network/erc20/any-to-erc20-proxy-add-data-generator'; -import * as DataConversionERC20FeeCreate from '../../utils/payment-network/erc20/any-to-erc20-proxy-create-data-generator'; -import * as TestData from '../../utils/test-data-generator'; +import AnyToErc20Proxy from '../../../src/extensions/payment-network/any-to-erc20-proxy.js'; +import * as DataConversionERC20FeeAddData from '../../utils/payment-network/erc20/any-to-erc20-proxy-add-data-generator.js'; +import * as DataConversionERC20FeeCreate from '../../utils/payment-network/erc20/any-to-erc20-proxy-create-data-generator.js'; +import * as TestData from '../../utils/test-data-generator.js'; const anyToErc20Proxy = new AnyToErc20Proxy(CurrencyManager.getDefault()); diff --git a/packages/advanced-logic/test/extensions/payment-network/any-to-eth-proxy.test.ts b/packages/advanced-logic/test/extensions/payment-network/any-to-eth-proxy.test.ts index 8525fbcdb4..94502cce04 100644 --- a/packages/advanced-logic/test/extensions/payment-network/any-to-eth-proxy.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/any-to-eth-proxy.test.ts @@ -2,10 +2,10 @@ import { CurrencyTypes, ExtensionTypes, RequestLogicTypes } from '@requestnetwor import { deepCopy } from '@requestnetwork/utils'; import { CurrencyManager, UnsupportedCurrencyError } from '@requestnetwork/currency'; -import AnyToEthProxy from '../../../src/extensions/payment-network/any-to-eth-proxy'; -import * as DataConversionETHFeeAddData from '../../utils/payment-network/ethereum/any-to-eth-proxy-add-data-generator'; -import * as DataConversionETHFeeCreate from '../../utils/payment-network/ethereum/any-to-eth-proxy-create-data-generator'; -import * as TestData from '../../utils/test-data-generator'; +import AnyToEthProxy from '../../../src/extensions/payment-network/any-to-eth-proxy.js'; +import * as DataConversionETHFeeAddData from '../../utils/payment-network/ethereum/any-to-eth-proxy-add-data-generator.js'; +import * as DataConversionETHFeeCreate from '../../utils/payment-network/ethereum/any-to-eth-proxy-create-data-generator.js'; +import * as TestData from '../../utils/test-data-generator.js'; const anyToEthProxy = new AnyToEthProxy(CurrencyManager.getDefault()); diff --git a/packages/advanced-logic/test/extensions/payment-network/any-to-near.test.ts b/packages/advanced-logic/test/extensions/payment-network/any-to-near.test.ts index 0fd2e16904..c659445034 100644 --- a/packages/advanced-logic/test/extensions/payment-network/any-to-near.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/any-to-near.test.ts @@ -5,15 +5,15 @@ import { extensionStateWithAnyToNativeTokenPaymentAndRefund, extensionStateAnyToNativeWithPaymentAddressAdded, extensionStateAnyToNativeWithFeeAdded, -} from '../../utils/payment-network/any/generator-data-create'; -import { AdvancedLogic } from '../../../src'; -import { arbitraryTimestamp, payeeRaw, payerRaw } from '../../utils/test-data-generator'; +} from '../../utils/payment-network/any/generator-data-create.js'; +import { AdvancedLogic } from '../../../src/index.js'; +import { arbitraryTimestamp, payeeRaw, payerRaw } from '../../utils/test-data-generator.js'; import { CurrencyTypes, ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import AnyToNearPaymentNetwork from '../../../src/extensions/payment-network/near/any-to-near'; -import AnyToNativeTokenPaymentNetwork from '../../../src/extensions/payment-network/any-to-native'; +import AnyToNearPaymentNetwork from '../../../src/extensions/payment-network/near/any-to-near.js'; +import AnyToNativeTokenPaymentNetwork from '../../../src/extensions/payment-network/any-to-native.js'; import { CurrencyManager } from '@requestnetwork/currency'; import { deepCopy } from '@requestnetwork/utils'; -import AnyToNearTestnetPaymentNetwork from '../../../src/extensions/payment-network/near/any-to-near-testnet'; +import AnyToNearTestnetPaymentNetwork from '../../../src/extensions/payment-network/near/any-to-near-testnet.js'; const salt = arbitrarySalt; const currencyManager = CurrencyManager.getDefault(); diff --git a/packages/advanced-logic/test/extensions/payment-network/bitcoin/mainnet-address-based.test.ts b/packages/advanced-logic/test/extensions/payment-network/bitcoin/mainnet-address-based.test.ts index 1671625232..bfeccd0ba4 100644 --- a/packages/advanced-logic/test/extensions/payment-network/bitcoin/mainnet-address-based.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/bitcoin/mainnet-address-based.test.ts @@ -1,8 +1,8 @@ -import MainnetBitcoinAddressBasedPN from '../../../../src/extensions/payment-network/bitcoin/mainnet-address-based'; +import MainnetBitcoinAddressBasedPN from '../../../../src/extensions/payment-network/bitcoin/mainnet-address-based.js'; import { deepCopy } from '@requestnetwork/utils'; -import * as DataBTCAddPaymentAddress from '../../../utils/payment-network/bitcoin/generator-data-add-payment-address'; -import * as DataBTCCreate from '../../../utils/payment-network/bitcoin/generator-data-create'; -import * as TestData from '../../../utils/test-data-generator'; +import * as DataBTCAddPaymentAddress from '../../../utils/payment-network/bitcoin/generator-data-add-payment-address.js'; +import * as DataBTCCreate from '../../../utils/payment-network/bitcoin/generator-data-create.js'; +import * as TestData from '../../../utils/test-data-generator.js'; const mainnetBitcoinAddressBasedPN = new MainnetBitcoinAddressBasedPN(); diff --git a/packages/advanced-logic/test/extensions/payment-network/bitcoin/testnet-address-based.test.ts b/packages/advanced-logic/test/extensions/payment-network/bitcoin/testnet-address-based.test.ts index 7133bad547..dca37c5ec4 100644 --- a/packages/advanced-logic/test/extensions/payment-network/bitcoin/testnet-address-based.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/bitcoin/testnet-address-based.test.ts @@ -1,8 +1,8 @@ -import TestnetBitcoinAddressBasedPN from '../../../../src/extensions/payment-network/bitcoin/testnet-address-based'; +import TestnetBitcoinAddressBasedPN from '../../../../src/extensions/payment-network/bitcoin/testnet-address-based.js'; import { deepCopy } from '@requestnetwork/utils'; -import * as DataBTCAddPaymentAddress from '../../../utils/payment-network/bitcoin/testnet-generator-data-add-payment-address'; -import * as DataBTCCreate from '../../../utils/payment-network/bitcoin/testnet-generator-data-create'; -import * as TestData from '../../../utils/test-data-generator'; +import * as DataBTCAddPaymentAddress from '../../../utils/payment-network/bitcoin/testnet-generator-data-add-payment-address.js'; +import * as DataBTCCreate from '../../../utils/payment-network/bitcoin/testnet-generator-data-create.js'; +import * as TestData from '../../../utils/test-data-generator.js'; const testnetBitcoinAddressBasedPN = new TestnetBitcoinAddressBasedPN(); diff --git a/packages/advanced-logic/test/extensions/payment-network/declarative.test.ts b/packages/advanced-logic/test/extensions/payment-network/declarative.test.ts index e500322d49..cbaf7d5a0f 100644 --- a/packages/advanced-logic/test/extensions/payment-network/declarative.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/declarative.test.ts @@ -1,10 +1,10 @@ -import PnAnyDeclarative from '../../../src/extensions/payment-network/declarative'; +import PnAnyDeclarative from '../../../src/extensions/payment-network/declarative.js'; import { deepCopy } from '@requestnetwork/utils'; import { ExtensionTypes } from '@requestnetwork/types'; -import * as TestDataDeclarative from '../../utils/payment-network/any/generator-data-create'; -import * as TestData from '../../utils/test-data-generator'; +import * as TestDataDeclarative from '../../utils/payment-network/any/generator-data-create.js'; +import * as TestData from '../../utils/test-data-generator.js'; const pnAnyDeclarative = new PnAnyDeclarative(); diff --git a/packages/advanced-logic/test/extensions/payment-network/erc20/address-based.test.ts b/packages/advanced-logic/test/extensions/payment-network/erc20/address-based.test.ts index f55fbe41c6..45fc4121af 100644 --- a/packages/advanced-logic/test/extensions/payment-network/erc20/address-based.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/erc20/address-based.test.ts @@ -1,8 +1,8 @@ -import Erc20AddressBasedPaymentNetwork from '../../../../src/extensions/payment-network/erc20/address-based'; +import Erc20AddressBasedPaymentNetwork from '../../../../src/extensions/payment-network/erc20/address-based.js'; -import * as DataERC20AddPaymentAddress from '../../../utils/payment-network/erc20/address-based-add-payment-address-data-generator'; -import * as DataERC20Create from '../../../utils/payment-network/erc20/address-based-create-data-generator'; -import * as TestData from '../../../utils/test-data-generator'; +import * as DataERC20AddPaymentAddress from '../../../utils/payment-network/erc20/address-based-add-payment-address-data-generator.js'; +import * as DataERC20Create from '../../../utils/payment-network/erc20/address-based-create-data-generator.js'; +import * as TestData from '../../../utils/test-data-generator.js'; import { deepCopy } from '@requestnetwork/utils'; const erc20AddressBasedPaymentNetwork = new Erc20AddressBasedPaymentNetwork(); diff --git a/packages/advanced-logic/test/extensions/payment-network/erc20/fee-proxy-contract.test.ts b/packages/advanced-logic/test/extensions/payment-network/erc20/fee-proxy-contract.test.ts index 5469971600..84c9862d6e 100644 --- a/packages/advanced-logic/test/extensions/payment-network/erc20/fee-proxy-contract.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/erc20/fee-proxy-contract.test.ts @@ -1,11 +1,11 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import * as DataERC20FeeAddData from '../../../utils/payment-network/erc20/fee-proxy-contract-add-data-generator'; -import * as DataERC20FeeCreate from '../../../utils/payment-network/erc20/fee-proxy-contract-create-data-generator'; -import * as DataNearERC20FeeCreate from '../../../utils/payment-network/erc20/near-fee-proxy-contract'; -import * as TestData from '../../../utils/test-data-generator'; +import * as DataERC20FeeAddData from '../../../utils/payment-network/erc20/fee-proxy-contract-add-data-generator.js'; +import * as DataERC20FeeCreate from '../../../utils/payment-network/erc20/fee-proxy-contract-create-data-generator.js'; +import * as DataNearERC20FeeCreate from '../../../utils/payment-network/erc20/near-fee-proxy-contract.js'; +import * as TestData from '../../../utils/test-data-generator.js'; import { deepCopy } from '@requestnetwork/utils'; -import { AdvancedLogic } from '../../../../src'; +import { AdvancedLogic } from '../../../../src/index.js'; const advancedLogic = new AdvancedLogic(); const erc20FeeProxyContract = advancedLogic.getFeeProxyContractErc20ForNetwork(); diff --git a/packages/advanced-logic/test/extensions/payment-network/erc20/proxy-contract.test.ts b/packages/advanced-logic/test/extensions/payment-network/erc20/proxy-contract.test.ts index af4e4e4205..a83d83e42b 100644 --- a/packages/advanced-logic/test/extensions/payment-network/erc20/proxy-contract.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/erc20/proxy-contract.test.ts @@ -1,10 +1,10 @@ import { ExtensionTypes, RequestLogicTypes, IdentityTypes } from '@requestnetwork/types'; -import Erc20ProxyContract from '../../../../src/extensions/payment-network/erc20/proxy-contract'; +import Erc20ProxyContract from '../../../../src/extensions/payment-network/erc20/proxy-contract.js'; -import * as DataERC20AddPaymentAddress from '../../../utils/payment-network/erc20/proxy-contract-add-payment-address-data-generator'; -import * as DataERC20Create from '../../../utils/payment-network/erc20/proxy-contract-create-data-generator'; -import * as TestData from '../../../utils/test-data-generator'; +import * as DataERC20AddPaymentAddress from '../../../utils/payment-network/erc20/proxy-contract-add-payment-address-data-generator.js'; +import * as DataERC20Create from '../../../utils/payment-network/erc20/proxy-contract-create-data-generator.js'; +import * as TestData from '../../../utils/test-data-generator.js'; import { deepCopy } from '@requestnetwork/utils'; const erc20ProxyContract = new Erc20ProxyContract(); diff --git a/packages/advanced-logic/test/extensions/payment-network/erc777/stream.test.ts b/packages/advanced-logic/test/extensions/payment-network/erc777/stream.test.ts index 640eec5547..a6920c4d94 100644 --- a/packages/advanced-logic/test/extensions/payment-network/erc777/stream.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/erc777/stream.test.ts @@ -1,11 +1,11 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import Erc777StreamPaymentNetwork from '../../../../src/extensions/payment-network/erc777/stream'; +import Erc777StreamPaymentNetwork from '../../../../src/extensions/payment-network/erc777/stream.js'; -import * as DataERC777StreamAddData from '../../../utils/payment-network/erc777/stream-add-data-generator'; -import * as DataERC777StreamCreate from '../../../utils/payment-network/erc777/stream-create-data-generator'; -import * as TestData from '../../../utils/test-data-generator'; +import * as DataERC777StreamAddData from '../../../utils/payment-network/erc777/stream-add-data-generator.js'; +import * as DataERC777StreamCreate from '../../../utils/payment-network/erc777/stream-create-data-generator.js'; +import * as TestData from '../../../utils/test-data-generator.js'; const erc777StreamPaymentNetwork = new Erc777StreamPaymentNetwork(); diff --git a/packages/advanced-logic/test/extensions/payment-network/ethereum/fee-proxy-contract.test.ts b/packages/advanced-logic/test/extensions/payment-network/ethereum/fee-proxy-contract.test.ts index 8bfd5557b7..e462316865 100644 --- a/packages/advanced-logic/test/extensions/payment-network/ethereum/fee-proxy-contract.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/ethereum/fee-proxy-contract.test.ts @@ -1,10 +1,10 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import EthereumFeeProxyContract from '../../../../src/extensions/payment-network/ethereum/fee-proxy-contract'; +import EthereumFeeProxyContract from '../../../../src/extensions/payment-network/ethereum/fee-proxy-contract.js'; -import * as DataEthFeeAddData from '../../../utils/payment-network/ethereum/fee-proxy-contract-add-data-generator'; -import * as DataEthFeeCreate from '../../../utils/payment-network/ethereum/fee-proxy-contract-create-data-generator'; -import * as TestData from '../../../utils/test-data-generator'; +import * as DataEthFeeAddData from '../../../utils/payment-network/ethereum/fee-proxy-contract-add-data-generator.js'; +import * as DataEthFeeCreate from '../../../utils/payment-network/ethereum/fee-proxy-contract-create-data-generator.js'; +import * as TestData from '../../../utils/test-data-generator.js'; import { deepCopy } from '@requestnetwork/utils'; const ethFeeProxyContract = new EthereumFeeProxyContract(); diff --git a/packages/advanced-logic/test/extensions/payment-network/ethereum/input-data.test.ts b/packages/advanced-logic/test/extensions/payment-network/ethereum/input-data.test.ts index a29f0e2d76..7cfea41353 100644 --- a/packages/advanced-logic/test/extensions/payment-network/ethereum/input-data.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/ethereum/input-data.test.ts @@ -1,11 +1,11 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import EthereumInputDataPaymentNetwork from '../../../../src/extensions/payment-network/ethereum/input-data'; +import EthereumInputDataPaymentNetwork from '../../../../src/extensions/payment-network/ethereum/input-data.js'; -import * as DataEthAddPaymentAddress from '../../../utils/payment-network/ethereum/add-payment-address-data-generator'; -import * as DataEthCreate from '../../../utils/payment-network/ethereum/create-data-generator'; -import * as TestData from '../../../utils/test-data-generator'; +import * as DataEthAddPaymentAddress from '../../../utils/payment-network/ethereum/add-payment-address-data-generator.js'; +import * as DataEthCreate from '../../../utils/payment-network/ethereum/create-data-generator.js'; +import * as TestData from '../../../utils/test-data-generator.js'; const ethereumInputDataPaymentNetwork = new EthereumInputDataPaymentNetwork(); diff --git a/packages/advanced-logic/test/extensions/payment-network/native-token.test.ts b/packages/advanced-logic/test/extensions/payment-network/native-token.test.ts index c84c6f01bd..ecf5a6f2e0 100644 --- a/packages/advanced-logic/test/extensions/payment-network/native-token.test.ts +++ b/packages/advanced-logic/test/extensions/payment-network/native-token.test.ts @@ -1,18 +1,18 @@ -import NativeTokenPaymentNetwork from '../../../src/extensions/payment-network/native-token'; -import NearNativePaymentNetwork from '../../../src/extensions/payment-network/near/near-native'; +import NativeTokenPaymentNetwork from '../../../src/extensions/payment-network/native-token.js'; +import NearNativePaymentNetwork from '../../../src/extensions/payment-network/near/near-native.js'; import { arbitrarySalt, requestStateNoExtensions, -} from '../../utils/payment-network/any/generator-data-create'; +} from '../../utils/payment-network/any/generator-data-create.js'; import { actionCreationWithNativeTokenPayment, extensionStateWithNativeTokenPaymentAndRefund, extensionStateWithPaymentAddressAdded, -} from '../../utils/payment-network/mocked_native_data'; -import { AdvancedLogic } from '../../../src'; -import { arbitraryTimestamp, payeeRaw } from '../../utils/test-data-generator'; +} from '../../utils/payment-network/mocked_native_data.js'; +import { AdvancedLogic } from '../../../src/index.js'; +import { arbitraryTimestamp, payeeRaw } from '../../utils/test-data-generator.js'; import { CurrencyTypes, ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import NearTestnetNativeNativePaymentNetwork from '../../../src/extensions/payment-network/near/near-testnet-native'; +import NearTestnetNativeNativePaymentNetwork from '../../../src/extensions/payment-network/near/near-testnet-native.js'; const salt = arbitrarySalt; diff --git a/packages/advanced-logic/test/utils/payment-network/address-based-add-payment-address-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/address-based-add-payment-address-data-generator.ts index d04671e322..79ad4a506c 100644 --- a/packages/advanced-logic/test/utils/payment-network/address-based-add-payment-address-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/address-based-add-payment-address-data-generator.ts @@ -1,6 +1,6 @@ -import * as TestDataCreate from './address-based-data-generator'; +import * as TestDataCreate from './address-based-data-generator.js'; -import * as TestData from '../test-data-generator'; +import * as TestData from '../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/address-based-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/address-based-data-generator.ts index 0a35b1946c..9612334156 100644 --- a/packages/advanced-logic/test/utils/payment-network/address-based-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/address-based-data-generator.ts @@ -1,4 +1,4 @@ -import * as TestData from '../test-data-generator'; +import * as TestData from '../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/any/generator-data-create.ts b/packages/advanced-logic/test/utils/payment-network/any/generator-data-create.ts index a2185101eb..477539404a 100644 --- a/packages/advanced-logic/test/utils/payment-network/any/generator-data-create.ts +++ b/packages/advanced-logic/test/utils/payment-network/any/generator-data-create.ts @@ -1,4 +1,4 @@ -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/bitcoin/generator-data-add-payment-address.ts b/packages/advanced-logic/test/utils/payment-network/bitcoin/generator-data-add-payment-address.ts index df67013ddf..d9923a407d 100644 --- a/packages/advanced-logic/test/utils/payment-network/bitcoin/generator-data-add-payment-address.ts +++ b/packages/advanced-logic/test/utils/payment-network/bitcoin/generator-data-add-payment-address.ts @@ -1,6 +1,6 @@ -import * as TestDataCreate from './generator-data-create'; +import * as TestDataCreate from './generator-data-create.js'; -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/bitcoin/generator-data-create.ts b/packages/advanced-logic/test/utils/payment-network/bitcoin/generator-data-create.ts index 1aa4286f2c..0c9b5b9234 100644 --- a/packages/advanced-logic/test/utils/payment-network/bitcoin/generator-data-create.ts +++ b/packages/advanced-logic/test/utils/payment-network/bitcoin/generator-data-create.ts @@ -1,4 +1,4 @@ -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/bitcoin/testnet-generator-data-add-payment-address.ts b/packages/advanced-logic/test/utils/payment-network/bitcoin/testnet-generator-data-add-payment-address.ts index fccc59a0fb..d14371234d 100644 --- a/packages/advanced-logic/test/utils/payment-network/bitcoin/testnet-generator-data-add-payment-address.ts +++ b/packages/advanced-logic/test/utils/payment-network/bitcoin/testnet-generator-data-add-payment-address.ts @@ -1,6 +1,6 @@ -import * as TestDataCreate from './generator-data-create'; +import * as TestDataCreate from './generator-data-create.js'; -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/bitcoin/testnet-generator-data-create.ts b/packages/advanced-logic/test/utils/payment-network/bitcoin/testnet-generator-data-create.ts index 4172190a94..c2c73f78bd 100644 --- a/packages/advanced-logic/test/utils/payment-network/bitcoin/testnet-generator-data-create.ts +++ b/packages/advanced-logic/test/utils/payment-network/bitcoin/testnet-generator-data-create.ts @@ -1,4 +1,4 @@ -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/erc20/address-based-add-payment-address-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/erc20/address-based-add-payment-address-data-generator.ts index 1afde0419f..e992bed897 100644 --- a/packages/advanced-logic/test/utils/payment-network/erc20/address-based-add-payment-address-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/erc20/address-based-add-payment-address-data-generator.ts @@ -1,6 +1,6 @@ -import * as TestDataCreate from './address-based-create-data-generator'; +import * as TestDataCreate from './address-based-create-data-generator.js'; -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/erc20/address-based-create-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/erc20/address-based-create-data-generator.ts index 0449d5c75b..cc0e392b71 100644 --- a/packages/advanced-logic/test/utils/payment-network/erc20/address-based-create-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/erc20/address-based-create-data-generator.ts @@ -1,4 +1,4 @@ -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/erc20/any-to-erc20-proxy-add-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/erc20/any-to-erc20-proxy-add-data-generator.ts index 09aee69b4f..385be1385e 100644 --- a/packages/advanced-logic/test/utils/payment-network/erc20/any-to-erc20-proxy-add-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/erc20/any-to-erc20-proxy-add-data-generator.ts @@ -1,6 +1,6 @@ -import * as TestDataCreate from './fee-proxy-contract-create-data-generator'; +import * as TestDataCreate from './fee-proxy-contract-create-data-generator.js'; -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/erc20/any-to-erc20-proxy-create-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/erc20/any-to-erc20-proxy-create-data-generator.ts index 14f9720488..e83e2ab5da 100644 --- a/packages/advanced-logic/test/utils/payment-network/erc20/any-to-erc20-proxy-create-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/erc20/any-to-erc20-proxy-create-data-generator.ts @@ -1,4 +1,4 @@ -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/erc20/fee-proxy-contract-add-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/erc20/fee-proxy-contract-add-data-generator.ts index 71fc030387..3d660b0a22 100644 --- a/packages/advanced-logic/test/utils/payment-network/erc20/fee-proxy-contract-add-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/erc20/fee-proxy-contract-add-data-generator.ts @@ -1,6 +1,6 @@ -import * as TestDataCreate from './fee-proxy-contract-create-data-generator'; +import * as TestDataCreate from './fee-proxy-contract-create-data-generator.js'; -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/erc20/fee-proxy-contract-create-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/erc20/fee-proxy-contract-create-data-generator.ts index f79a429033..c09501f3cc 100644 --- a/packages/advanced-logic/test/utils/payment-network/erc20/fee-proxy-contract-create-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/erc20/fee-proxy-contract-create-data-generator.ts @@ -1,4 +1,4 @@ -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/erc20/near-fee-proxy-contract.ts b/packages/advanced-logic/test/utils/payment-network/erc20/near-fee-proxy-contract.ts index 366c5b04ac..9bb7580613 100644 --- a/packages/advanced-logic/test/utils/payment-network/erc20/near-fee-proxy-contract.ts +++ b/packages/advanced-logic/test/utils/payment-network/erc20/near-fee-proxy-contract.ts @@ -1,4 +1,4 @@ -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/erc20/proxy-contract-add-payment-address-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/erc20/proxy-contract-add-payment-address-data-generator.ts index 0bfc8d90a3..4afaa94da5 100644 --- a/packages/advanced-logic/test/utils/payment-network/erc20/proxy-contract-add-payment-address-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/erc20/proxy-contract-add-payment-address-data-generator.ts @@ -1,6 +1,6 @@ -import * as TestDataCreate from './proxy-contract-create-data-generator'; +import * as TestDataCreate from './proxy-contract-create-data-generator.js'; -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/erc20/proxy-contract-create-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/erc20/proxy-contract-create-data-generator.ts index d1544130be..40b1aab14f 100644 --- a/packages/advanced-logic/test/utils/payment-network/erc20/proxy-contract-create-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/erc20/proxy-contract-create-data-generator.ts @@ -1,4 +1,4 @@ -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/erc777/stream-add-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/erc777/stream-add-data-generator.ts index e3dbe552cb..c36a5e8b39 100644 --- a/packages/advanced-logic/test/utils/payment-network/erc777/stream-add-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/erc777/stream-add-data-generator.ts @@ -1,6 +1,6 @@ -import * as TestDataCreate from './stream-create-data-generator'; +import * as TestDataCreate from './stream-create-data-generator.js'; -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/erc777/stream-create-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/erc777/stream-create-data-generator.ts index 3ee89b7229..7d5bcb3be4 100644 --- a/packages/advanced-logic/test/utils/payment-network/erc777/stream-create-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/erc777/stream-create-data-generator.ts @@ -1,4 +1,4 @@ -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/ethereum/add-payment-address-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/ethereum/add-payment-address-data-generator.ts index b19caf602d..3dd316b50f 100644 --- a/packages/advanced-logic/test/utils/payment-network/ethereum/add-payment-address-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/ethereum/add-payment-address-data-generator.ts @@ -1,6 +1,6 @@ -import * as TestDataCreate from './create-data-generator'; +import * as TestDataCreate from './create-data-generator.js'; -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/ethereum/any-to-eth-proxy-add-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/ethereum/any-to-eth-proxy-add-data-generator.ts index d0bff650b6..8cfcd98615 100644 --- a/packages/advanced-logic/test/utils/payment-network/ethereum/any-to-eth-proxy-add-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/ethereum/any-to-eth-proxy-add-data-generator.ts @@ -1,6 +1,6 @@ -import * as TestDataCreate from './fee-proxy-contract-create-data-generator'; +import * as TestDataCreate from './fee-proxy-contract-create-data-generator.js'; -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/ethereum/any-to-eth-proxy-create-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/ethereum/any-to-eth-proxy-create-data-generator.ts index 1a81b83bae..28ce37b214 100644 --- a/packages/advanced-logic/test/utils/payment-network/ethereum/any-to-eth-proxy-create-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/ethereum/any-to-eth-proxy-create-data-generator.ts @@ -1,4 +1,4 @@ -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/ethereum/create-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/ethereum/create-data-generator.ts index fe69fa8fe9..12d51e4007 100644 --- a/packages/advanced-logic/test/utils/payment-network/ethereum/create-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/ethereum/create-data-generator.ts @@ -1,4 +1,4 @@ -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/ethereum/fee-proxy-contract-add-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/ethereum/fee-proxy-contract-add-data-generator.ts index 9a7051b80e..9bc5cdf985 100644 --- a/packages/advanced-logic/test/utils/payment-network/ethereum/fee-proxy-contract-add-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/ethereum/fee-proxy-contract-add-data-generator.ts @@ -1,6 +1,6 @@ -import * as TestDataCreate from './fee-proxy-contract-create-data-generator'; +import * as TestDataCreate from './fee-proxy-contract-create-data-generator.js'; -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/ethereum/fee-proxy-contract-create-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/ethereum/fee-proxy-contract-create-data-generator.ts index dff8d18fe0..02f880e809 100644 --- a/packages/advanced-logic/test/utils/payment-network/ethereum/fee-proxy-contract-create-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/ethereum/fee-proxy-contract-create-data-generator.ts @@ -1,4 +1,4 @@ -import * as TestData from '../../test-data-generator'; +import * as TestData from '../../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/reference-based-add-payment-address-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/reference-based-add-payment-address-data-generator.ts index a6263faafa..3eda2faa76 100644 --- a/packages/advanced-logic/test/utils/payment-network/reference-based-add-payment-address-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/reference-based-add-payment-address-data-generator.ts @@ -1,6 +1,6 @@ -import * as TestDataCreate from './reference-based-data-generator'; +import * as TestDataCreate from './reference-based-data-generator.js'; -import * as TestData from '../test-data-generator'; +import * as TestData from '../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/advanced-logic/test/utils/payment-network/reference-based-data-generator.ts b/packages/advanced-logic/test/utils/payment-network/reference-based-data-generator.ts index fcbbc58d17..5acce56e47 100644 --- a/packages/advanced-logic/test/utils/payment-network/reference-based-data-generator.ts +++ b/packages/advanced-logic/test/utils/payment-network/reference-based-data-generator.ts @@ -1,4 +1,4 @@ -import * as TestData from '../test-data-generator'; +import * as TestData from '../test-data-generator.js'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; diff --git a/packages/currency/package.json b/packages/currency/package.json index 3c8d107c0b..f4cabaea49 100644 --- a/packages/currency/package.json +++ b/packages/currency/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/currency", "version": "0.10.0", + "type": "module", "publishConfig": { "access": "public" }, diff --git a/packages/currency/src/chains/ChainsAbstract.ts b/packages/currency/src/chains/ChainsAbstract.ts index d498baa959..e3f612dc09 100644 --- a/packages/currency/src/chains/ChainsAbstract.ts +++ b/packages/currency/src/chains/ChainsAbstract.ts @@ -1,6 +1,6 @@ -import { Chain, NamedNativeCurrency, TokenMap } from '../types'; +import { Chain, NamedNativeCurrency, TokenMap } from '../types.js'; import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { nativeCurrencies } from '../native'; +import { nativeCurrencies } from '../native.js'; export abstract class ChainsAbstract< CHAIN_NAME extends CurrencyTypes.ChainName, diff --git a/packages/currency/src/chains/btc/BtcChains.ts b/packages/currency/src/chains/btc/BtcChains.ts index defd944134..7b5331603e 100644 --- a/packages/currency/src/chains/btc/BtcChains.ts +++ b/packages/currency/src/chains/btc/BtcChains.ts @@ -1,6 +1,6 @@ -import { ChainsAbstract } from '../ChainsAbstract'; +import { ChainsAbstract } from '../ChainsAbstract.js'; import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { BtcChain, chains } from './index'; +import { BtcChain, chains } from './index.js'; class BtcChains extends ChainsAbstract {} export default new BtcChains(chains, RequestLogicTypes.CURRENCY.BTC); diff --git a/packages/currency/src/chains/btc/index.ts b/packages/currency/src/chains/btc/index.ts index 7c46a09b8e..9486bc3458 100644 --- a/packages/currency/src/chains/btc/index.ts +++ b/packages/currency/src/chains/btc/index.ts @@ -1,8 +1,8 @@ import { CurrencyTypes } from '@requestnetwork/types'; -import { Chain } from '../../types'; +import { Chain } from '../../types.js'; -import * as MainnetDefinition from './data/mainnet'; -import * as TestnetDefinition from './data/testnet'; +import * as MainnetDefinition from './data/mainnet.js'; +import * as TestnetDefinition from './data/testnet.js'; export type BtcChain = Chain & { chainId: string; diff --git a/packages/currency/src/chains/declarative/DeclarativeChains.ts b/packages/currency/src/chains/declarative/DeclarativeChains.ts index 68f36f7454..3b1f84e92e 100644 --- a/packages/currency/src/chains/declarative/DeclarativeChains.ts +++ b/packages/currency/src/chains/declarative/DeclarativeChains.ts @@ -1,6 +1,6 @@ -import { ChainsAbstract } from '../ChainsAbstract'; +import { ChainsAbstract } from '../ChainsAbstract.js'; import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { DeclarativeChain, chains } from './index'; +import { DeclarativeChain, chains } from './index.js'; class DeclarativeChains extends ChainsAbstract< CurrencyTypes.DeclarativeChainName, diff --git a/packages/currency/src/chains/declarative/index.ts b/packages/currency/src/chains/declarative/index.ts index 6e38952bd8..7425a40bda 100644 --- a/packages/currency/src/chains/declarative/index.ts +++ b/packages/currency/src/chains/declarative/index.ts @@ -1,8 +1,8 @@ import { CurrencyTypes } from '@requestnetwork/types'; -import { Chain } from '../../types'; +import { Chain } from '../../types.js'; -import * as TronDefinition from './data/tron'; -import * as SolanaDefinition from './data/solana'; +import * as TronDefinition from './data/tron.js'; +import * as SolanaDefinition from './data/solana.js'; export type DeclarativeChain = Chain; diff --git a/packages/currency/src/chains/evm/EvmChains.ts b/packages/currency/src/chains/evm/EvmChains.ts index f9ee82f6de..5419a694d3 100644 --- a/packages/currency/src/chains/evm/EvmChains.ts +++ b/packages/currency/src/chains/evm/EvmChains.ts @@ -1,6 +1,6 @@ -import { ChainsAbstract } from '../ChainsAbstract'; +import { ChainsAbstract } from '../ChainsAbstract.js'; import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { chains, EvmChain } from './index'; +import { chains, EvmChain } from './index.js'; class EvmChains extends ChainsAbstract {} export default new EvmChains(chains, RequestLogicTypes.CURRENCY.ETH); diff --git a/packages/currency/src/chains/evm/data/avalanche.ts b/packages/currency/src/chains/evm/data/avalanche.ts index 6bd1c9f5d6..40df142b6e 100644 --- a/packages/currency/src/chains/evm/data/avalanche.ts +++ b/packages/currency/src/chains/evm/data/avalanche.ts @@ -1,5 +1,5 @@ -import { TokenMap } from '../../../types'; -import { supportedAvalancheERC20 } from '../../../erc20/chains/avalanche'; +import { TokenMap } from '../../../types.js'; +import { supportedAvalancheERC20 } from '../../../erc20/chains/avalanche.js'; export const chainId = 43114; export const currencies: TokenMap = { diff --git a/packages/currency/src/chains/evm/data/bsc.ts b/packages/currency/src/chains/evm/data/bsc.ts index b13f8f522a..a0770f8d54 100644 --- a/packages/currency/src/chains/evm/data/bsc.ts +++ b/packages/currency/src/chains/evm/data/bsc.ts @@ -1,5 +1,5 @@ -import { TokenMap } from '../../../types'; -import { supportedBSCERC20 } from '../../../erc20/chains/bsc'; +import { TokenMap } from '../../../types.js'; +import { supportedBSCERC20 } from '../../../erc20/chains/bsc.js'; export const chainId = 56; export const currencies: TokenMap = { diff --git a/packages/currency/src/chains/evm/data/bsctest.ts b/packages/currency/src/chains/evm/data/bsctest.ts index 7fc2bc374e..27a79b66f0 100644 --- a/packages/currency/src/chains/evm/data/bsctest.ts +++ b/packages/currency/src/chains/evm/data/bsctest.ts @@ -1,5 +1,5 @@ -import { TokenMap } from '../../../types'; -import { supportedBSCTestERC20 } from '../../../erc20/chains/bsctest'; +import { TokenMap } from '../../../types.js'; +import { supportedBSCTestERC20 } from '../../../erc20/chains/bsctest.js'; export const chainId = 97; export const currencies: TokenMap = { diff --git a/packages/currency/src/chains/evm/data/celo.ts b/packages/currency/src/chains/evm/data/celo.ts index f07c603cd4..dbcffd8ba5 100644 --- a/packages/currency/src/chains/evm/data/celo.ts +++ b/packages/currency/src/chains/evm/data/celo.ts @@ -1,5 +1,5 @@ -import { TokenMap } from '../../../types'; -import { supportedCeloERC20 } from '../../../erc20/chains/celo'; +import { TokenMap } from '../../../types.js'; +import { supportedCeloERC20 } from '../../../erc20/chains/celo.js'; export const chainId = 42220; export const currencies: TokenMap = { diff --git a/packages/currency/src/chains/evm/data/fantom.ts b/packages/currency/src/chains/evm/data/fantom.ts index 596a2db0db..c7ee7629f2 100644 --- a/packages/currency/src/chains/evm/data/fantom.ts +++ b/packages/currency/src/chains/evm/data/fantom.ts @@ -1,5 +1,5 @@ -import { TokenMap } from '../../../types'; -import { supportedFantomERC20 } from '../../../erc20/chains/fantom'; +import { TokenMap } from '../../../types.js'; +import { supportedFantomERC20 } from '../../../erc20/chains/fantom.js'; export const chainId = 250; export const currencies: TokenMap = { diff --git a/packages/currency/src/chains/evm/data/goerli.ts b/packages/currency/src/chains/evm/data/goerli.ts index 2f700bcfbd..b866ee1700 100644 --- a/packages/currency/src/chains/evm/data/goerli.ts +++ b/packages/currency/src/chains/evm/data/goerli.ts @@ -1,5 +1,5 @@ -import { TokenMap } from '../../../types'; -import { supportedGoerliERC20 } from '../../../erc20/chains/goerli'; +import { TokenMap } from '../../../types.js'; +import { supportedGoerliERC20 } from '../../../erc20/chains/goerli.js'; export const chainId = 5; export const testnet = true; diff --git a/packages/currency/src/chains/evm/data/mainnet.ts b/packages/currency/src/chains/evm/data/mainnet.ts index 4e6bb83ceb..2e7863c922 100644 --- a/packages/currency/src/chains/evm/data/mainnet.ts +++ b/packages/currency/src/chains/evm/data/mainnet.ts @@ -1,5 +1,5 @@ -import { TokenMap } from '../../../types'; -import { supportedMainnetERC20 } from '../../../erc20/chains/mainnet'; +import { TokenMap } from '../../../types.js'; +import { supportedMainnetERC20 } from '../../../erc20/chains/mainnet.js'; export const chainId = 1; export const currencies: TokenMap = { diff --git a/packages/currency/src/chains/evm/data/matic.ts b/packages/currency/src/chains/evm/data/matic.ts index a7738d898c..ff0b1a60c7 100644 --- a/packages/currency/src/chains/evm/data/matic.ts +++ b/packages/currency/src/chains/evm/data/matic.ts @@ -1,5 +1,5 @@ -import { TokenMap } from '../../../types'; -import { supportedMaticERC20 } from '../../../erc20/chains/matic'; +import { TokenMap } from '../../../types.js'; +import { supportedMaticERC20 } from '../../../erc20/chains/matic.js'; export const chainId = 137; export const currencies: TokenMap = { diff --git a/packages/currency/src/chains/evm/data/moonbeam.ts b/packages/currency/src/chains/evm/data/moonbeam.ts index de586f0b7b..e5e71825e7 100644 --- a/packages/currency/src/chains/evm/data/moonbeam.ts +++ b/packages/currency/src/chains/evm/data/moonbeam.ts @@ -1,5 +1,5 @@ -import { TokenMap } from '../../../types'; -import { supportedMoonbeamERC20 } from '../../../erc20/chains/moonbeam'; +import { TokenMap } from '../../../types.js'; +import { supportedMoonbeamERC20 } from '../../../erc20/chains/moonbeam.js'; export const chainId = 1284; export const currencies: TokenMap = { diff --git a/packages/currency/src/chains/evm/data/optimism.ts b/packages/currency/src/chains/evm/data/optimism.ts index 447d2f2300..73a3c6f53e 100644 --- a/packages/currency/src/chains/evm/data/optimism.ts +++ b/packages/currency/src/chains/evm/data/optimism.ts @@ -1,5 +1,5 @@ -import { TokenMap } from '../../../types'; -import { supportedOptimismERC20 } from '../../../erc20/chains/optimism'; +import { TokenMap } from '../../../types.js'; +import { supportedOptimismERC20 } from '../../../erc20/chains/optimism.js'; export const chainId = 10; export const currencies: TokenMap = { diff --git a/packages/currency/src/chains/evm/data/rinkeby.ts b/packages/currency/src/chains/evm/data/rinkeby.ts index aa9da936d3..87aa8962d0 100644 --- a/packages/currency/src/chains/evm/data/rinkeby.ts +++ b/packages/currency/src/chains/evm/data/rinkeby.ts @@ -1,6 +1,6 @@ -import { TokenMap } from '../../../types'; -import { supportedRinkebyERC20 } from '../../../erc20/chains/rinkeby'; -import { supportedRinkebyERC777 } from '../../../erc777/chains/rinkeby'; +import { TokenMap } from '../../../types.js'; +import { supportedRinkebyERC20 } from '../../../erc20/chains/rinkeby.js'; +import { supportedRinkebyERC777 } from '../../../erc777/chains/rinkeby.js'; export const chainId = 4; export const testnet = true; diff --git a/packages/currency/src/chains/evm/data/xdai.ts b/packages/currency/src/chains/evm/data/xdai.ts index edbf8ba0ce..3f4157448f 100644 --- a/packages/currency/src/chains/evm/data/xdai.ts +++ b/packages/currency/src/chains/evm/data/xdai.ts @@ -1,5 +1,5 @@ -import { TokenMap } from '../../../types'; -import { supportedXDAIERC20 } from '../../../erc20/chains/xdai'; +import { TokenMap } from '../../../types.js'; +import { supportedXDAIERC20 } from '../../../erc20/chains/xdai.js'; export const chainId = 100; export const currencies: TokenMap = { diff --git a/packages/currency/src/chains/evm/index.ts b/packages/currency/src/chains/evm/index.ts index 5d88250495..b7738a8219 100644 --- a/packages/currency/src/chains/evm/index.ts +++ b/packages/currency/src/chains/evm/index.ts @@ -1,29 +1,29 @@ import { CurrencyTypes } from '@requestnetwork/types'; -import { Chain } from '../../types'; +import { Chain } from '../../types.js'; -import * as AlfajoresDefinition from './data/alfajores'; -import * as ArbitrumOneDefinition from './data/arbitrum-one'; -import * as ArbitrumRinkebyDefinition from './data/arbitrum-rinkeby'; -import * as AvalancheDefinition from './data/avalanche'; -import * as BscDefinition from './data/bsc'; -import * as BscTestDefinition from './data/bsctest'; -import * as CeloDefinition from './data/celo'; -import * as FantomDefinition from './data/fantom'; -import * as FuseDefinition from './data/fuse'; -import * as GoerliDefinition from './data/goerli'; -import * as MainnetDefinition from './data/mainnet'; -import * as MantleDefinition from './data/mantle'; -import * as MantleTestnetDefinition from './data/mantle-testnet'; -import * as MaticDefinition from './data/matic'; -import * as MoonbeamDefinition from './data/moonbeam'; -import * as MumbaiDefinition from './data/mumbai'; -import * as OptimismDefinition from './data/optimism'; -import * as PrivateDefinition from './data/private'; -import * as RinkebyDefinition from './data/rinkeby'; -import * as RoninDefinition from './data/ronin'; -import * as SokolDefinition from './data/sokol'; -import * as TombchainDefinition from './data/tombchain'; -import * as XDaiDefinition from './data/xdai'; +import * as AlfajoresDefinition from './data/alfajores.js'; +import * as ArbitrumOneDefinition from './data/arbitrum-one.js'; +import * as ArbitrumRinkebyDefinition from './data/arbitrum-rinkeby.js'; +import * as AvalancheDefinition from './data/avalanche.js'; +import * as BscDefinition from './data/bsc.js'; +import * as BscTestDefinition from './data/bsctest.js'; +import * as CeloDefinition from './data/celo.js'; +import * as FantomDefinition from './data/fantom.js'; +import * as FuseDefinition from './data/fuse.js'; +import * as GoerliDefinition from './data/goerli.js'; +import * as MainnetDefinition from './data/mainnet.js'; +import * as MantleDefinition from './data/mantle.js'; +import * as MantleTestnetDefinition from './data/mantle-testnet.js'; +import * as MaticDefinition from './data/matic.js'; +import * as MoonbeamDefinition from './data/moonbeam.js'; +import * as MumbaiDefinition from './data/mumbai.js'; +import * as OptimismDefinition from './data/optimism.js'; +import * as PrivateDefinition from './data/private.js'; +import * as RinkebyDefinition from './data/rinkeby.js'; +import * as RoninDefinition from './data/ronin.js'; +import * as SokolDefinition from './data/sokol.js'; +import * as TombchainDefinition from './data/tombchain.js'; +import * as XDaiDefinition from './data/xdai.js'; export type EvmChain = Chain & { chainId: number; diff --git a/packages/currency/src/chains/index.ts b/packages/currency/src/chains/index.ts index 3bcd7acd23..623cbda3d7 100644 --- a/packages/currency/src/chains/index.ts +++ b/packages/currency/src/chains/index.ts @@ -1,7 +1,7 @@ -import BtcChains from './btc/BtcChains'; -import EvmChains from './evm/EvmChains'; -import NearChains from './near/NearChains'; -import DeclarativeChains from './declarative/DeclarativeChains'; -import { isSameChain } from './utils'; +import BtcChains from './btc/BtcChains.js'; +import EvmChains from './evm/EvmChains.js'; +import NearChains from './near/NearChains.js'; +import DeclarativeChains from './declarative/DeclarativeChains.js'; +import { isSameChain } from './utils.js'; export { BtcChains, EvmChains, NearChains, DeclarativeChains, isSameChain }; diff --git a/packages/currency/src/chains/near/NearChains.ts b/packages/currency/src/chains/near/NearChains.ts index 411d734c56..39005048fd 100644 --- a/packages/currency/src/chains/near/NearChains.ts +++ b/packages/currency/src/chains/near/NearChains.ts @@ -1,6 +1,6 @@ -import { ChainsAbstract } from '../ChainsAbstract'; +import { ChainsAbstract } from '../ChainsAbstract.js'; import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { NearChain, chains } from './index'; +import { NearChain, chains } from './index.js'; class NearChains extends ChainsAbstract {} export default new NearChains(chains, RequestLogicTypes.CURRENCY.ETH); diff --git a/packages/currency/src/chains/near/index.ts b/packages/currency/src/chains/near/index.ts index 923cce384f..0df1fbfc83 100644 --- a/packages/currency/src/chains/near/index.ts +++ b/packages/currency/src/chains/near/index.ts @@ -1,8 +1,8 @@ import { CurrencyTypes } from '@requestnetwork/types'; -import { Chain } from '../../types'; +import { Chain } from '../../types.js'; -import * as NearDefinition from './data/near'; -import * as NearTestnetDefinition from './data/near-testnet'; +import * as NearDefinition from './data/near.js'; +import * as NearTestnetDefinition from './data/near-testnet.js'; export type NearChain = Chain; diff --git a/packages/currency/src/chains/utils.ts b/packages/currency/src/chains/utils.ts index 8850405067..4bd6de9f2b 100644 --- a/packages/currency/src/chains/utils.ts +++ b/packages/currency/src/chains/utils.ts @@ -1,6 +1,6 @@ -import BtcChains from './btc/BtcChains'; -import EvmChains from './evm/EvmChains'; -import NearChains from './near/NearChains'; +import BtcChains from './btc/BtcChains.js'; +import EvmChains from './evm/EvmChains.js'; +import NearChains from './near/NearChains.js'; // Returns true if both chains are equal or aliases export const isSameChain = (chain1: string, chain2: string): boolean => { diff --git a/packages/currency/src/conversion-aggregators.ts b/packages/currency/src/conversion-aggregators.ts index fb90a8d2af..4561e12c8e 100644 --- a/packages/currency/src/conversion-aggregators.ts +++ b/packages/currency/src/conversion-aggregators.ts @@ -1,5 +1,5 @@ import GRAPH from 'node-dijkstra'; -import { CurrencyDefinition } from './types'; +import { CurrencyDefinition } from './types.js'; import privateAggregator from './aggregators/private.json'; import mainnetAggregator from './aggregators/mainnet.json'; diff --git a/packages/currency/src/currency-utils.ts b/packages/currency/src/currency-utils.ts index 9da5ca87b0..d6de8ce059 100644 --- a/packages/currency/src/currency-utils.ts +++ b/packages/currency/src/currency-utils.ts @@ -4,7 +4,7 @@ import { ERC777CurrencyInput, ISO4217CurrencyInput, NativeCurrencyInput, -} from './types'; +} from './types.js'; import { RequestLogicTypes } from '@requestnetwork/types'; /** diff --git a/packages/currency/src/currencyManager.ts b/packages/currency/src/currencyManager.ts index 8afdba3b4e..64cdb3e14f 100644 --- a/packages/currency/src/currencyManager.ts +++ b/packages/currency/src/currencyManager.ts @@ -1,11 +1,11 @@ import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types'; import { utils } from 'ethers'; import addressValidator from 'multicoin-address-validator'; -import { getSupportedERC20Tokens } from './erc20'; -import { getSupportedERC777Tokens } from './erc777'; -import { getHash } from './getHash'; -import iso4217 from './iso4217'; -import { nativeCurrencies } from './native'; +import { getSupportedERC20Tokens } from './erc20/index.js'; +import { getSupportedERC777Tokens } from './erc777/index.js'; +import { getHash } from './getHash.js'; +import iso4217 from './iso4217.js'; +import { nativeCurrencies } from './native.js'; import { StorageCurrency, CurrencyDefinition, @@ -14,10 +14,10 @@ import { ICurrencyManager, LegacyTokenMap, NativeCurrencyType, -} from './types'; -import { defaultConversionPairs, AggregatorsMap, getPath } from './conversion-aggregators'; -import { isValidNearAddress } from './currency-utils'; -import { NearChains } from './chains'; +} from './types.js'; +import { defaultConversionPairs, AggregatorsMap, getPath } from './conversion-aggregators.js'; +import { isValidNearAddress } from './currency-utils.js'; +import { NearChains } from './chains/index.js'; const { BTC, ERC20, ERC777, ETH, ISO4217 } = RequestLogicTypes.CURRENCY; diff --git a/packages/currency/src/erc20/chains/avalanche.ts b/packages/currency/src/erc20/chains/avalanche.ts index b9ca4bd490..bde68a519f 100644 --- a/packages/currency/src/erc20/chains/avalanche.ts +++ b/packages/currency/src/erc20/chains/avalanche.ts @@ -1,4 +1,4 @@ -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; // List of the supported bsc network tokens export const supportedAvalancheERC20: TokenMap = { diff --git a/packages/currency/src/erc20/chains/bsc.ts b/packages/currency/src/erc20/chains/bsc.ts index c423a1003d..937e23624a 100644 --- a/packages/currency/src/erc20/chains/bsc.ts +++ b/packages/currency/src/erc20/chains/bsc.ts @@ -1,4 +1,4 @@ -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; // List of the supported bsc network tokens export const supportedBSCERC20: TokenMap = { diff --git a/packages/currency/src/erc20/chains/bsctest.ts b/packages/currency/src/erc20/chains/bsctest.ts index e5dd428752..017675f5de 100644 --- a/packages/currency/src/erc20/chains/bsctest.ts +++ b/packages/currency/src/erc20/chains/bsctest.ts @@ -1,4 +1,4 @@ -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; // List of the supported bsctest network tokens export const supportedBSCTestERC20: TokenMap = { diff --git a/packages/currency/src/erc20/chains/celo.ts b/packages/currency/src/erc20/chains/celo.ts index 9e56e7882f..be8ec2c5e2 100644 --- a/packages/currency/src/erc20/chains/celo.ts +++ b/packages/currency/src/erc20/chains/celo.ts @@ -1,4 +1,4 @@ -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; // List of the supported celo network tokens export const supportedCeloERC20: TokenMap = { diff --git a/packages/currency/src/erc20/chains/fantom.ts b/packages/currency/src/erc20/chains/fantom.ts index 33c47b9b79..32121ded43 100644 --- a/packages/currency/src/erc20/chains/fantom.ts +++ b/packages/currency/src/erc20/chains/fantom.ts @@ -1,4 +1,4 @@ -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; export const supportedFantomERC20: TokenMap = { '0xD3b71117E6C1558c1553305b44988cd944e97300': { diff --git a/packages/currency/src/erc20/chains/goerli.ts b/packages/currency/src/erc20/chains/goerli.ts index 68596661dd..290b0008da 100644 --- a/packages/currency/src/erc20/chains/goerli.ts +++ b/packages/currency/src/erc20/chains/goerli.ts @@ -1,4 +1,4 @@ -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; // List of the supported goerli ERC20 tokens export const supportedGoerliERC20: TokenMap = { diff --git a/packages/currency/src/erc20/chains/index.ts b/packages/currency/src/erc20/chains/index.ts index a87dc6c8f4..09e9292de2 100644 --- a/packages/currency/src/erc20/chains/index.ts +++ b/packages/currency/src/erc20/chains/index.ts @@ -1,18 +1,18 @@ -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; import { CurrencyTypes } from '@requestnetwork/types'; -import { supportedAvalancheERC20 } from './avalanche'; -import { supportedBSCERC20 } from './bsc'; -import { supportedBSCTestERC20 } from './bsctest'; -import { supportedCeloERC20 } from './celo'; -import { supportedFantomERC20 } from './fantom'; -import { supportedGoerliERC20 } from './goerli'; -import { supportedMainnetERC20 } from './mainnet'; -import { supportedMaticERC20 } from './matic'; -import { supportedMoonbeamERC20 } from './moonbeam'; -import { supportedOptimismERC20 } from './optimism'; -import { supportedRinkebyERC20 } from './rinkeby'; -import { supportedXDAIERC20 } from './xdai'; +import { supportedAvalancheERC20 } from './avalanche.js'; +import { supportedBSCERC20 } from './bsc.js'; +import { supportedBSCTestERC20 } from './bsctest.js'; +import { supportedCeloERC20 } from './celo.js'; +import { supportedFantomERC20 } from './fantom.js'; +import { supportedGoerliERC20 } from './goerli.js'; +import { supportedMainnetERC20 } from './mainnet.js'; +import { supportedMaticERC20 } from './matic.js'; +import { supportedMoonbeamERC20 } from './moonbeam.js'; +import { supportedOptimismERC20 } from './optimism.js'; +import { supportedRinkebyERC20 } from './rinkeby.js'; +import { supportedXDAIERC20 } from './xdai.js'; export const supportedNetworks: Partial> = { celo: supportedCeloERC20, diff --git a/packages/currency/src/erc20/chains/mainnet.ts b/packages/currency/src/erc20/chains/mainnet.ts index 4026029f12..1bd997897b 100644 --- a/packages/currency/src/erc20/chains/mainnet.ts +++ b/packages/currency/src/erc20/chains/mainnet.ts @@ -1,5 +1,5 @@ import * as metamaskContractMap from '@metamask/contract-metadata'; -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; // These interfaces are declared here because they should be used only in this context // A Token description from the eth-contract-metadata list diff --git a/packages/currency/src/erc20/chains/matic.ts b/packages/currency/src/erc20/chains/matic.ts index a3b8a01a7a..1613edb4cf 100644 --- a/packages/currency/src/erc20/chains/matic.ts +++ b/packages/currency/src/erc20/chains/matic.ts @@ -1,4 +1,4 @@ -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; // List of the supported matic network tokens export const supportedMaticERC20: TokenMap = { diff --git a/packages/currency/src/erc20/chains/moonbeam.ts b/packages/currency/src/erc20/chains/moonbeam.ts index 12aca53a59..35d300e8e5 100644 --- a/packages/currency/src/erc20/chains/moonbeam.ts +++ b/packages/currency/src/erc20/chains/moonbeam.ts @@ -1,4 +1,4 @@ -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; // List of the supported bsc network tokens export const supportedMoonbeamERC20: TokenMap = { diff --git a/packages/currency/src/erc20/chains/optimism.ts b/packages/currency/src/erc20/chains/optimism.ts index 439c079c8c..ec225765f3 100644 --- a/packages/currency/src/erc20/chains/optimism.ts +++ b/packages/currency/src/erc20/chains/optimism.ts @@ -1,4 +1,4 @@ -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; // List of the supported bsc network tokens export const supportedOptimismERC20: TokenMap = { diff --git a/packages/currency/src/erc20/chains/rinkeby.ts b/packages/currency/src/erc20/chains/rinkeby.ts index 8540c0faab..29083315ba 100644 --- a/packages/currency/src/erc20/chains/rinkeby.ts +++ b/packages/currency/src/erc20/chains/rinkeby.ts @@ -1,4 +1,4 @@ -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; // List of the supported rinkeby ERC20 tokens export const supportedRinkebyERC20: TokenMap = { diff --git a/packages/currency/src/erc20/chains/xdai.ts b/packages/currency/src/erc20/chains/xdai.ts index 2dbbbb4114..03e348f169 100644 --- a/packages/currency/src/erc20/chains/xdai.ts +++ b/packages/currency/src/erc20/chains/xdai.ts @@ -1,4 +1,4 @@ -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; // List of the supported bsc network tokens export const supportedXDAIERC20: TokenMap = { diff --git a/packages/currency/src/erc20/index.ts b/packages/currency/src/erc20/index.ts index 9a8bc5b7a3..d46a6d7b4e 100644 --- a/packages/currency/src/erc20/index.ts +++ b/packages/currency/src/erc20/index.ts @@ -1,5 +1,5 @@ -import { ERC20Currency, TokenMap } from '../types'; -import { supportedNetworks } from './chains'; +import { ERC20Currency, TokenMap } from '../types.js'; +import { supportedNetworks } from './chains/index.js'; import { CurrencyTypes } from '@requestnetwork/types'; /** diff --git a/packages/currency/src/erc777/chains/index.ts b/packages/currency/src/erc777/chains/index.ts index 05d09408bb..6d582f66ae 100644 --- a/packages/currency/src/erc777/chains/index.ts +++ b/packages/currency/src/erc777/chains/index.ts @@ -1,5 +1,5 @@ -import { supportedRinkebyERC777 } from './rinkeby'; -import { TokenMap } from '../../types'; +import { supportedRinkebyERC777 } from './rinkeby.js'; +import { TokenMap } from '../../types.js'; import { CurrencyTypes } from '@requestnetwork/types'; export const supportedNetworks: Partial> = { diff --git a/packages/currency/src/erc777/chains/rinkeby.ts b/packages/currency/src/erc777/chains/rinkeby.ts index 407297a0ea..f74b5edbdf 100644 --- a/packages/currency/src/erc777/chains/rinkeby.ts +++ b/packages/currency/src/erc777/chains/rinkeby.ts @@ -1,4 +1,4 @@ -import { TokenMap } from '../../types'; +import { TokenMap } from '../../types.js'; // List of the supported rinkeby ERC777 tokens export const supportedRinkebyERC777: TokenMap = { diff --git a/packages/currency/src/erc777/index.ts b/packages/currency/src/erc777/index.ts index 36e2f5f53a..ae0038aad6 100644 --- a/packages/currency/src/erc777/index.ts +++ b/packages/currency/src/erc777/index.ts @@ -1,5 +1,5 @@ -import { ERC777Currency, TokenMap } from '../types'; -import { supportedNetworks } from './chains'; +import { ERC777Currency, TokenMap } from '../types.js'; +import { supportedNetworks } from './chains/index.js'; import { CurrencyTypes } from '@requestnetwork/types'; /** diff --git a/packages/currency/src/index.ts b/packages/currency/src/index.ts index e3f77834d2..d873cd6a7b 100644 --- a/packages/currency/src/index.ts +++ b/packages/currency/src/index.ts @@ -1,13 +1,13 @@ -export * from './chains'; -export { getSupportedERC20Tokens } from './erc20'; -export { getSupportedERC777Tokens } from './erc777'; +export * from './chains/index.js'; +export { getSupportedERC20Tokens } from './erc20/index.js'; +export { getSupportedERC777Tokens } from './erc777/index.js'; export { conversionSupportedNetworks, CurrencyPairs, AggregatorsMap, -} from './conversion-aggregators'; -export { getHash as getCurrencyHash } from './getHash'; -export { CurrencyManager } from './currencyManager'; -export * from './types'; -export * from './errors'; -export * from './currency-utils'; +} from './conversion-aggregators.js'; +export { getHash as getCurrencyHash } from './getHash.js'; +export { CurrencyManager } from './currencyManager.js'; +export * from './types.js'; +export * from './errors.js'; +export * from './currency-utils.js'; diff --git a/packages/currency/src/native.ts b/packages/currency/src/native.ts index 40f6d40adf..ec744073e7 100644 --- a/packages/currency/src/native.ts +++ b/packages/currency/src/native.ts @@ -1,5 +1,5 @@ import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { NamedNativeCurrency } from './types'; +import { NamedNativeCurrency } from './types.js'; type NativeEthCurrency = NamedNativeCurrency & { network: CurrencyTypes.EvmChainName | CurrencyTypes.NearChainName; diff --git a/packages/currency/test/address-validation/near-validation.test.ts b/packages/currency/test/address-validation/near-validation.test.ts index dd03e39e1e..b76c680c99 100644 --- a/packages/currency/test/address-validation/near-validation.test.ts +++ b/packages/currency/test/address-validation/near-validation.test.ts @@ -1,4 +1,4 @@ -import { isValidNearAddress } from '../../src/currency-utils'; +import { isValidNearAddress } from '../../src/currency-utils.js'; const validNearAccount = 'testaccount.near'; const validNearHexAccount = 'f336b7833496cdcae230463c3daff7b2fe187a93be8df5b1326ce7a595033163'; diff --git a/packages/currency/test/chain-utils.test.ts b/packages/currency/test/chain-utils.test.ts index aa08e06209..01c0290758 100644 --- a/packages/currency/test/chain-utils.test.ts +++ b/packages/currency/test/chain-utils.test.ts @@ -1,4 +1,4 @@ -import { EvmChains, NearChains, isSameChain } from '../src/index'; +import { EvmChains, NearChains, isSameChain } from '../src/index.js'; describe('isSameChain', () => { it('Should return true for 2 identical EVMs', () => { diff --git a/packages/currency/test/chainlink-path-aggregators.test.ts b/packages/currency/test/chainlink-path-aggregators.test.ts index ad91d2f1db..63e1d2d7a5 100644 --- a/packages/currency/test/chainlink-path-aggregators.test.ts +++ b/packages/currency/test/chainlink-path-aggregators.test.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import { AggregatorsMap, getPath } from '../src/conversion-aggregators'; -import { CurrencyManager } from '../src'; +import { AggregatorsMap, getPath } from '../src/conversion-aggregators.js'; +import { CurrencyManager } from '../src/index.js'; const currencyManager = CurrencyManager.getDefault(); const USD = currencyManager.from('USD')!; const EUR = currencyManager.from('EUR')!; diff --git a/packages/currency/test/conversion-supported-currencies.test.ts b/packages/currency/test/conversion-supported-currencies.test.ts index 04f6ed14e0..04312b6c01 100644 --- a/packages/currency/test/conversion-supported-currencies.test.ts +++ b/packages/currency/test/conversion-supported-currencies.test.ts @@ -1,4 +1,4 @@ -import { CurrencyManager } from '../src'; +import { CurrencyManager } from '../src/index.js'; import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types'; const currencyManager = new CurrencyManager([ diff --git a/packages/currency/test/currency/erc20.test.ts b/packages/currency/test/currency/erc20.test.ts index 5e39700650..d57c00121d 100644 --- a/packages/currency/test/currency/erc20.test.ts +++ b/packages/currency/test/currency/erc20.test.ts @@ -1,6 +1,6 @@ -import { getSupportedERC20Tokens } from '../../src/erc20'; +import { getSupportedERC20Tokens } from '../../src/erc20.js'; import * as metamaskContractMap from '@metamask/contract-metadata'; -import { extraERC20Tokens } from '../../src/erc20/chains/mainnet'; +import { extraERC20Tokens } from '../../src/erc20/chains/mainnet.js'; import { utils } from 'ethers'; describe('erc20', () => { diff --git a/packages/currency/test/currency/erc777.test.ts b/packages/currency/test/currency/erc777.test.ts index 1b35680c6b..242a7b277c 100644 --- a/packages/currency/test/currency/erc777.test.ts +++ b/packages/currency/test/currency/erc777.test.ts @@ -1,4 +1,4 @@ -import { getSupportedERC777Tokens } from '../../src/erc777'; +import { getSupportedERC777Tokens } from '../../src/erc777.js'; import { utils } from 'ethers'; describe('erc777', () => { diff --git a/packages/currency/test/currencyManager.test.ts b/packages/currency/test/currencyManager.test.ts index 97a2f2ca42..5e2d4ef01a 100644 --- a/packages/currency/test/currencyManager.test.ts +++ b/packages/currency/test/currencyManager.test.ts @@ -5,7 +5,7 @@ import { CurrencyManager, ERC20Currency, StorageCurrency, -} from '../src'; +} from '../src/index.js'; const testCasesPerNetwork: Record>> = { mainnet: { diff --git a/packages/data-access/package.json b/packages/data-access/package.json index 4787e0cacf..8ab78e5616 100644 --- a/packages/data-access/package.json +++ b/packages/data-access/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/data-access", "version": "0.28.0", + "type": "module", "publishConfig": { "access": "public" }, diff --git a/packages/data-access/src/data-access.ts b/packages/data-access/src/data-access.ts index 47a961b898..9f4b45659a 100644 --- a/packages/data-access/src/data-access.ts +++ b/packages/data-access/src/data-access.ts @@ -2,13 +2,13 @@ import MultiFormat from '@requestnetwork/multi-format'; import { DataAccessTypes, LogTypes, StorageTypes } from '@requestnetwork/types'; import { deepCopy, getCurrentTimestampInSecond, SimpleLogger, unique } from '@requestnetwork/utils'; -import * as Bluebird from 'bluebird'; +import Bluebird from 'bluebird'; import { EventEmitter } from 'events'; -import Block from './block'; -import IgnoredLocationIndex from './ignored-location'; -import IntervalTimer from './interval-timer'; -import TransactionIndex from './transaction-index'; +import Block from './block.js'; +import IgnoredLocationIndex from './ignored-location.js'; +import IntervalTimer from './interval-timer.js'; +import TransactionIndex from './transaction-index/index.js'; // Default interval time for auto synchronization const DEFAULT_INTERVAL_TIME = 10000; diff --git a/packages/data-access/src/ignored-location.ts b/packages/data-access/src/ignored-location.ts index 416f6d5c18..edd4a2e66b 100644 --- a/packages/data-access/src/ignored-location.ts +++ b/packages/data-access/src/ignored-location.ts @@ -1,4 +1,4 @@ -import * as Keyv from 'keyv'; +import Keyv from 'keyv'; /** * Interface for reason from location diff --git a/packages/data-access/src/index.ts b/packages/data-access/src/index.ts index c3240bb96e..26a0bddd7f 100644 --- a/packages/data-access/src/index.ts +++ b/packages/data-access/src/index.ts @@ -1,4 +1,4 @@ -export { default as DataAccess } from './data-access'; -export { default as TransactionIndex } from './transaction-index'; -export { default as Block } from './block'; -export { CombinedDataAccess } from './combined-data-access'; +export { default as DataAccess } from './data-access.js'; +export { default as TransactionIndex } from './transaction-index/index.js'; +export { default as Block } from './block.js'; +export { CombinedDataAccess } from './combined-data-access.js'; diff --git a/packages/data-access/src/transaction-index/index.ts b/packages/data-access/src/transaction-index/index.ts index f2a99778cf..55381c7ab2 100644 --- a/packages/data-access/src/transaction-index/index.ts +++ b/packages/data-access/src/transaction-index/index.ts @@ -1,6 +1,6 @@ -import TransactionIndex from './transaction-index'; +import TransactionIndex from './transaction-index.js'; -export * from './location-by-topic'; -export * from './timestamp-by-location'; +export * from './location-by-topic.js'; +export * from './timestamp-by-location.js'; export default TransactionIndex; diff --git a/packages/data-access/src/transaction-index/location-by-topic.ts b/packages/data-access/src/transaction-index/location-by-topic.ts index c84cc6d84d..cbecda9e54 100644 --- a/packages/data-access/src/transaction-index/location-by-topic.ts +++ b/packages/data-access/src/transaction-index/location-by-topic.ts @@ -1,6 +1,6 @@ import { DataAccessTypes } from '@requestnetwork/types'; -import * as Keyv from 'keyv'; +import Keyv from 'keyv'; import { flatten2DimensionsArray, unique } from '@requestnetwork/utils'; // Serialize function used for keyv to serialize a Set data structure into a string diff --git a/packages/data-access/src/transaction-index/timestamp-by-location.ts b/packages/data-access/src/transaction-index/timestamp-by-location.ts index 47a991cf8d..44124db711 100644 --- a/packages/data-access/src/transaction-index/timestamp-by-location.ts +++ b/packages/data-access/src/transaction-index/timestamp-by-location.ts @@ -1,6 +1,6 @@ import { DataAccessTypes } from '@requestnetwork/types'; -import * as Keyv from 'keyv'; +import Keyv from 'keyv'; /** * Class used to store the block's timestamp indexed by location diff --git a/packages/data-access/src/transaction-index/transaction-index.ts b/packages/data-access/src/transaction-index/transaction-index.ts index c23b01a8c3..c6d69789ca 100644 --- a/packages/data-access/src/transaction-index/transaction-index.ts +++ b/packages/data-access/src/transaction-index/transaction-index.ts @@ -1,10 +1,10 @@ import { DataAccessTypes } from '@requestnetwork/types'; -import * as Bluebird from 'bluebird'; -import * as Keyv from 'keyv'; +import Bluebird from 'bluebird'; +import Keyv from 'keyv'; -import LocationByTopic from './location-by-topic'; -import TimestampByLocation from './timestamp-by-location'; +import LocationByTopic from './location-by-topic.js'; +import TimestampByLocation from './timestamp-by-location.js'; /** * An in-memory implementation of the transaction index. diff --git a/packages/data-access/test/block.test.ts b/packages/data-access/test/block.test.ts index 307cacda95..7568d07feb 100644 --- a/packages/data-access/test/block.test.ts +++ b/packages/data-access/test/block.test.ts @@ -1,5 +1,5 @@ import { DataAccessTypes } from '@requestnetwork/types'; -import RequestDataAccessBlock from '../src/block'; +import RequestDataAccessBlock from '../src/block.js'; const CURRENT_VERSION = '0.1.0'; const transactionDataMock1String = JSON.stringify({ diff --git a/packages/data-access/test/data-access.test.ts b/packages/data-access/test/data-access.test.ts index 9f58ed0309..03a543e3b0 100644 --- a/packages/data-access/test/data-access.test.ts +++ b/packages/data-access/test/data-access.test.ts @@ -2,9 +2,9 @@ import { EventEmitter } from 'events'; import { DataAccessTypes, StorageTypes } from '@requestnetwork/types'; -import RequestDataAccessBlock from '../src/block'; -import DataAccess from '../src/data-access'; -import TransactionIndex from '../src/transaction-index'; +import RequestDataAccessBlock from '../src/block.js'; +import DataAccess from '../src/data-access.js'; +import TransactionIndex from '../src/transaction-index.js'; // We use this function to flush the call stack // If we don't use this function, the fake timer will be increased before the interval function being called diff --git a/packages/data-access/test/ignored-location.test.ts b/packages/data-access/test/ignored-location.test.ts index 394bd1bcee..a07fc0a26c 100644 --- a/packages/data-access/test/ignored-location.test.ts +++ b/packages/data-access/test/ignored-location.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/await-thenable */ /* eslint-disable no-magic-numbers */ -import IgnoredLocation from '../src/ignored-location'; +import IgnoredLocation from '../src/ignored-location.js'; const arbitraryDataId1 = 'dataId1'; const arbitraryDataId2 = 'dataId2'; diff --git a/packages/data-access/test/interval-timer.test.ts b/packages/data-access/test/interval-timer.test.ts index 6471e240bd..f547a7cf68 100644 --- a/packages/data-access/test/interval-timer.test.ts +++ b/packages/data-access/test/interval-timer.test.ts @@ -1,6 +1,6 @@ import { LogTypes } from '@requestnetwork/types'; -import IntervalTimer from '../src/interval-timer'; +import IntervalTimer from '../src/interval-timer.js'; let intervalTimer: IntervalTimer; diff --git a/packages/data-access/test/location-by-topic.test.ts b/packages/data-access/test/location-by-topic.test.ts index 436e3402c7..cac8fe06c5 100644 --- a/packages/data-access/test/location-by-topic.test.ts +++ b/packages/data-access/test/location-by-topic.test.ts @@ -1,4 +1,4 @@ -import LocationByTopic from '../src/transaction-index/location-by-topic'; +import LocationByTopic from '../src/transaction-index/location-by-topic.js'; const arbitraryId1 = 'id1'; const arbitraryId2 = 'id2'; diff --git a/packages/data-access/test/timestamp-by-location.test.ts b/packages/data-access/test/timestamp-by-location.test.ts index 2bc7f84781..4faff5772e 100644 --- a/packages/data-access/test/timestamp-by-location.test.ts +++ b/packages/data-access/test/timestamp-by-location.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/await-thenable */ /* eslint-disable no-magic-numbers */ -import TimestampByLocationTransactionIndex from '../src/transaction-index/timestamp-by-location'; +import TimestampByLocationTransactionIndex from '../src/transaction-index/timestamp-by-location.js'; const arbitraryDataId1 = 'dataId1'; diff --git a/packages/data-access/test/transaction-index.test.ts b/packages/data-access/test/transaction-index.test.ts index 2fddea0663..f858880cd8 100644 --- a/packages/data-access/test/transaction-index.test.ts +++ b/packages/data-access/test/transaction-index.test.ts @@ -3,8 +3,8 @@ import { DataAccessTypes } from '@requestnetwork/types'; -import TransactionIndex from '../src/transaction-index/index'; -import TimestampByLocation from '../src/transaction-index/timestamp-by-location'; +import TransactionIndex from '../src/transaction-index/index.js'; +import TimestampByLocation from '../src/transaction-index/timestamp-by-location.js'; const testBlock: DataAccessTypes.IBlockHeader = { channelIds: { 'request-1': [1] }, diff --git a/packages/data-format/package.json b/packages/data-format/package.json index 6dd8ffe39c..01570e6ce2 100644 --- a/packages/data-format/package.json +++ b/packages/data-format/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/data-format", "version": "0.11.0", + "type": "module", "publishConfig": { "access": "public" }, diff --git a/packages/data-format/src/format/rnf_invoice/index.ts b/packages/data-format/src/format/rnf_invoice/index.ts index 7410101663..b9e70eb654 100644 --- a/packages/data-format/src/format/rnf_invoice/index.ts +++ b/packages/data-format/src/format/rnf_invoice/index.ts @@ -1,2 +1,2 @@ -export type { ActorInfo, Address, Invoice, InvoiceItem, PaymentTerms, Tax } from './types'; -export * from './utils'; +export type { ActorInfo, Address, Invoice, InvoiceItem, PaymentTerms, Tax } from './types.js'; +export * from './utils.js'; diff --git a/packages/data-format/src/format/rnf_invoice/utils.ts b/packages/data-format/src/format/rnf_invoice/utils.ts index 8401f8a342..1c72ea11ef 100644 --- a/packages/data-format/src/format/rnf_invoice/utils.ts +++ b/packages/data-format/src/format/rnf_invoice/utils.ts @@ -1,5 +1,5 @@ import { BigNumber, FixedNumber } from 'ethers'; -import { Invoice, InvoiceItem } from './types'; +import { Invoice, InvoiceItem } from './types.js'; export const getInvoiceTotal = (invoice: Invoice): BigNumber => { return invoice.invoiceItems.reduce( diff --git a/packages/data-format/src/index.ts b/packages/data-format/src/index.ts index 47dcf5f46d..91793d7d6e 100644 --- a/packages/data-format/src/index.ts +++ b/packages/data-format/src/index.ts @@ -1,7 +1,7 @@ -import * as AJV from 'ajv'; +import AJV from 'ajv'; import * as jsonSchema from 'ajv/lib/refs/json-schema-draft-06.json'; import * as schemaAddress from './format/address.json'; -import formats from './format'; +import formats from './format/index.js'; export default { /** @@ -54,4 +54,4 @@ export default { // using `exports` as introduced in Node 12.7.0 (https://nodejs.org/api/packages.html#packages_subpath_exports) // but typescript doesn't currently support this (https://github.com/microsoft/TypeScript/issues/33079) // NB: compatibilty with browser would need to be tested. -export * from './format/rnf_invoice'; +export * from './format/rnf_invoice/index.js'; diff --git a/packages/data-format/test/rnf_invoice/utils.test.ts b/packages/data-format/test/rnf_invoice/utils.test.ts index bfd3250bc6..931ecefdda 100644 --- a/packages/data-format/test/rnf_invoice/utils.test.ts +++ b/packages/data-format/test/rnf_invoice/utils.test.ts @@ -2,7 +2,7 @@ import { getInvoiceTotal, getInvoiceTotalWithoutTax, getInvoiceTaxTotal, -} from '../../src/format/rnf_invoice'; +} from '../../src/format/rnf_invoice.js'; const baseInvoiceItem = { name: 'test 1', diff --git a/packages/data-format/test/test.ts b/packages/data-format/test/test.ts index c91c7149f9..06e3e6f6c5 100644 --- a/packages/data-format/test/test.ts +++ b/packages/data-format/test/test.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-var-requires */ -import DataFormat from '../src/index'; +import DataFormat from '../src/index.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ describe('Request Network Data Validator', () => { diff --git a/packages/epk-decryption/package.json b/packages/epk-decryption/package.json index 388698d6c1..29dbc2471e 100644 --- a/packages/epk-decryption/package.json +++ b/packages/epk-decryption/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/epk-decryption", "version": "0.3.35", + "type": "module", "publishConfig": { "access": "public" }, @@ -31,7 +32,7 @@ "dist" ], "scripts": { - "build": "run-s build:commonjs build:umd", + "build": "run-s build:commonjs", "build:commonjs": "tsc -b tsconfig.build.json", "build:umd": "webpack", "clean": "shx rm -rf dist tsconfig.tsbuildinfo tsconfig.build.tsbuildinfo", diff --git a/packages/epk-decryption/src/index.ts b/packages/epk-decryption/src/index.ts index 9f4b71bb48..680c880145 100644 --- a/packages/epk-decryption/src/index.ts +++ b/packages/epk-decryption/src/index.ts @@ -1 +1 @@ -export { default as EthereumPrivateKeyDecryptionProvider } from './ethereum-private-key-decryption-provider'; +export { default as EthereumPrivateKeyDecryptionProvider } from './ethereum-private-key-decryption-provider.js'; diff --git a/packages/epk-decryption/test/ethereum-private-key-decryption-provider.test.ts b/packages/epk-decryption/test/ethereum-private-key-decryption-provider.test.ts index da11831808..8f5f5d1702 100644 --- a/packages/epk-decryption/test/ethereum-private-key-decryption-provider.test.ts +++ b/packages/epk-decryption/test/ethereum-private-key-decryption-provider.test.ts @@ -1,6 +1,6 @@ import { EncryptionTypes, IdentityTypes } from '@requestnetwork/types'; -import EthereumPrivateKeyDecryptionProvider from '../src/ethereum-private-key-decryption-provider'; +import EthereumPrivateKeyDecryptionProvider from '../src/ethereum-private-key-decryption-provider.js'; import { encrypt } from '@requestnetwork/utils'; export const id1Raw = { diff --git a/packages/epk-signature/package.json b/packages/epk-signature/package.json index 460c0c1893..e4235a954d 100644 --- a/packages/epk-signature/package.json +++ b/packages/epk-signature/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/epk-signature", "version": "0.5.36", + "type": "module", "publishConfig": { "access": "public" }, @@ -31,7 +32,7 @@ "dist" ], "scripts": { - "build": "run-s build:commonjs build:umd", + "build": "run-s build:commonjs", "build:commonjs": "tsc -b tsconfig.build.json", "build:umd": "webpack", "clean": "shx rm -rf dist tsconfig.tsbuildinfo tsconfig.build.tsbuildinfo", diff --git a/packages/epk-signature/src/index.ts b/packages/epk-signature/src/index.ts index 5085bac0df..7352448c51 100644 --- a/packages/epk-signature/src/index.ts +++ b/packages/epk-signature/src/index.ts @@ -1 +1 @@ -export { default as EthereumPrivateKeySignatureProvider } from './ethereum-private-key-signature-provider'; +export { default as EthereumPrivateKeySignatureProvider } from './ethereum-private-key-signature-provider.js'; diff --git a/packages/epk-signature/test/ethereum-private-key-signature-provider.test.ts b/packages/epk-signature/test/ethereum-private-key-signature-provider.test.ts index 5f2c001f05..9fb43db616 100644 --- a/packages/epk-signature/test/ethereum-private-key-signature-provider.test.ts +++ b/packages/epk-signature/test/ethereum-private-key-signature-provider.test.ts @@ -1,6 +1,6 @@ import { IdentityTypes, SignatureTypes } from '@requestnetwork/types'; -import EthereumPrivateKeySignatureProvider from '../src/ethereum-private-key-signature-provider'; +import EthereumPrivateKeySignatureProvider from '../src/ethereum-private-key-signature-provider.js'; import { ecSign, normalizeKeccak256Hash } from '@requestnetwork/utils'; const id1Raw = { diff --git a/packages/ethereum-storage/package.json b/packages/ethereum-storage/package.json index 439184317c..3f34e7faa5 100644 --- a/packages/ethereum-storage/package.json +++ b/packages/ethereum-storage/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/ethereum-storage", "version": "0.28.0", + "type": "module", "publishConfig": { "access": "public" }, @@ -45,16 +46,16 @@ "@requestnetwork/smart-contracts": "0.30.0", "@requestnetwork/types": "0.37.0", "@requestnetwork/utils": "0.37.0", - "axios": "0.27.2", + "axios": "1.5.1", "bluebird": "3.7.2", "ethers": "5.5.1", "form-data": "3.0.0", - "ipfs-unixfs": "6.0.7", + "ipfs-unixfs": "11.1.0", "keyv": "4.0.3", "qs": "6.10.3", "shelljs": "0.8.5", "tslib": "2.5.0", - "typed-emitter": "1.4.0", + "tiny-typed-emitter": "2.1.0", "web3-eth": "1.3.6", "web3-utils": "1.3.6", "yargs": "17.6.2" diff --git a/packages/ethereum-storage/src/ethereum-entries-to-ipfs-content.ts b/packages/ethereum-storage/src/ethereum-entries-to-ipfs-content.ts index 3704c75c3f..4690568bee 100644 --- a/packages/ethereum-storage/src/ethereum-entries-to-ipfs-content.ts +++ b/packages/ethereum-storage/src/ethereum-entries-to-ipfs-content.ts @@ -1,10 +1,10 @@ -import * as Bluebird from 'bluebird'; +import Bluebird from 'bluebird'; import { LogTypes, StorageTypes } from '@requestnetwork/types'; -import { getMaxIpfsReadRetry } from './config'; +import { getMaxIpfsReadRetry } from './config.js'; -import IgnoredDataIds from './ignored-dataIds'; -import IpfsConnectionError from './ipfs-connection-error'; +import IgnoredDataIds from './ignored-dataIds.js'; +import IpfsConnectionError from './ipfs-connection-error.js'; /** * Verify the hashes are present on IPFS for the corresponding ethereum entry diff --git a/packages/ethereum-storage/src/ethereum-metadata-cache.ts b/packages/ethereum-storage/src/ethereum-metadata-cache.ts index 53071fe501..73c8ba4c48 100644 --- a/packages/ethereum-storage/src/ethereum-metadata-cache.ts +++ b/packages/ethereum-storage/src/ethereum-metadata-cache.ts @@ -1,6 +1,6 @@ import { StorageTypes } from '@requestnetwork/types'; -import * as Keyv from 'keyv'; +import Keyv from 'keyv'; /** * Allows to save and retrieve ethereum metadata associated to a data id diff --git a/packages/ethereum-storage/src/ethereum-storage-ethers.ts b/packages/ethereum-storage/src/ethereum-storage-ethers.ts index 7c1ef5e9ee..47ceccb509 100644 --- a/packages/ethereum-storage/src/ethereum-storage-ethers.ts +++ b/packages/ethereum-storage/src/ethereum-storage-ethers.ts @@ -1,11 +1,11 @@ import { EventEmitter } from 'events'; import { BigNumber, ContractReceipt, providers, Signer } from 'ethers'; -import TypedEmitter from 'typed-emitter'; +import { TypedEmitter } from 'tiny-typed-emitter'; import { CurrencyTypes, LogTypes, StorageTypes } from '@requestnetwork/types'; import { requestHashSubmitterArtifact } from '@requestnetwork/smart-contracts'; -import { EthereumTransactionSubmitter } from './ethereum-tx-submitter'; +import { EthereumTransactionSubmitter } from './ethereum-tx-submitter.js'; import { getCurrentTimestampInSecond, SimpleLogger } from '@requestnetwork/utils'; -import { getDefaultEthereumBlockConfirmations } from './config'; +import { getDefaultEthereumBlockConfirmations } from './config.js'; export type GasDefinerProps = { gasPriceMin?: BigNumber; diff --git a/packages/ethereum-storage/src/ethereum-storage.ts b/packages/ethereum-storage/src/ethereum-storage.ts index 52180f5bf5..8a370a0035 100644 --- a/packages/ethereum-storage/src/ethereum-storage.ts +++ b/packages/ethereum-storage/src/ethereum-storage.ts @@ -1,14 +1,14 @@ import { LogTypes, StorageTypes } from '@requestnetwork/types'; -import * as Bluebird from 'bluebird'; +import Bluebird from 'bluebird'; import { EventEmitter } from 'events'; -import { getMaxConcurrency } from './config'; +import { getMaxConcurrency } from './config.js'; -import ethereumEntriesToIpfsContent from './ethereum-entries-to-ipfs-content'; -import EthereumMetadataCache from './ethereum-metadata-cache'; -import IgnoredDataIds from './ignored-dataIds'; -import SmartContractManager from './smart-contract-manager'; +import ethereumEntriesToIpfsContent from './ethereum-entries-to-ipfs-content.js'; +import EthereumMetadataCache from './ethereum-metadata-cache.js'; +import IgnoredDataIds from './ignored-dataIds.js'; +import SmartContractManager from './smart-contract-manager.js'; -import * as Keyv from 'keyv'; +import Keyv from 'keyv'; import { BigNumber } from 'ethers'; import { getCurrentTimestampInSecond, SimpleLogger } from '@requestnetwork/utils'; diff --git a/packages/ethereum-storage/src/ethereum-tx-submitter.ts b/packages/ethereum-storage/src/ethereum-tx-submitter.ts index 0ea970dfdb..9b113751b6 100644 --- a/packages/ethereum-storage/src/ethereum-tx-submitter.ts +++ b/packages/ethereum-storage/src/ethereum-tx-submitter.ts @@ -2,8 +2,8 @@ import { ContractTransaction, providers, utils } from 'ethers'; import { LogTypes } from '@requestnetwork/types'; import { requestHashSubmitterArtifact } from '@requestnetwork/smart-contracts'; import { RequestOpenHashSubmitter } from '@requestnetwork/smart-contracts/types'; -import { SubmitterProps } from './ethereum-storage-ethers'; -import { GasFeeDefiner } from './gas-fee-definer'; +import { SubmitterProps } from './ethereum-storage-ethers.js'; +import { GasFeeDefiner } from './gas-fee-definer.js'; import { SimpleLogger, isEip1559Supported } from '@requestnetwork/utils'; /** diff --git a/packages/ethereum-storage/src/ethereum-utils.ts b/packages/ethereum-storage/src/ethereum-utils.ts index fae9c21aab..e296d50fae 100644 --- a/packages/ethereum-storage/src/ethereum-utils.ts +++ b/packages/ethereum-storage/src/ethereum-utils.ts @@ -1,5 +1,5 @@ import { CurrencyTypes, StorageTypes } from '@requestnetwork/types'; -import * as config from './config'; +import * as config from './config.js'; import { BigNumber } from 'ethers'; import { EvmChains } from '@requestnetwork/currency'; diff --git a/packages/ethereum-storage/src/gas-fee-definer.ts b/packages/ethereum-storage/src/gas-fee-definer.ts index ae275e65b7..7a8d920e82 100644 --- a/packages/ethereum-storage/src/gas-fee-definer.ts +++ b/packages/ethereum-storage/src/gas-fee-definer.ts @@ -2,7 +2,7 @@ import { suggestFees } from '@rainbow-me/fee-suggestions'; import { BigNumber, providers, constants } from 'ethers'; import { normalizeGasFees } from '@requestnetwork/utils'; import { FeeTypes, LogTypes } from '@requestnetwork/types'; -import { GasDefinerProps } from './ethereum-storage-ethers'; +import { GasDefinerProps } from './ethereum-storage-ethers.js'; export class GasFeeDefiner { private readonly logger: LogTypes.ILogger; diff --git a/packages/ethereum-storage/src/gas-price-definer.ts b/packages/ethereum-storage/src/gas-price-definer.ts index bf6c1209a1..4edf1dc71e 100644 --- a/packages/ethereum-storage/src/gas-price-definer.ts +++ b/packages/ethereum-storage/src/gas-price-definer.ts @@ -1,15 +1,15 @@ -import * as config from './config'; -import EtherchainProvider from './gas-price-providers/etherchain-provider'; -import EtherscanProvider from './gas-price-providers/etherscan-provider'; -import EthGasStationProvider from './gas-price-providers/ethgasstation-provider'; +import * as config from './config.js'; +import EtherchainProvider from './gas-price-providers/etherchain-provider.js'; +import EtherscanProvider from './gas-price-providers/etherscan-provider.js'; +import EthGasStationProvider from './gas-price-providers/ethgasstation-provider.js'; import { CurrencyTypes, LogTypes, StorageTypes } from '@requestnetwork/types'; import { BigNumber } from 'ethers'; -import XDaiFixedProvider from './gas-price-providers/xdai-fixed-provider'; -import { GasDefinerProps } from './ethereum-storage-ethers'; +import XDaiFixedProvider from './gas-price-providers/xdai-fixed-provider.js'; +import { GasDefinerProps } from './ethereum-storage-ethers.js'; import { SimpleLogger } from '@requestnetwork/utils'; -import { getEthereumStorageNetworkIdFromName } from './ethereum-utils'; +import { getEthereumStorageNetworkIdFromName } from './ethereum-utils.js'; /** * Determines the gas price to use depending on the used network diff --git a/packages/ethereum-storage/src/gas-price-providers/etherchain-provider.ts b/packages/ethereum-storage/src/gas-price-providers/etherchain-provider.ts index 135612fc41..9067529554 100644 --- a/packages/ethereum-storage/src/gas-price-providers/etherchain-provider.ts +++ b/packages/ethereum-storage/src/gas-price-providers/etherchain-provider.ts @@ -4,7 +4,7 @@ import Axios from 'axios'; import { BigNumber } from 'ethers'; import { retry } from '@requestnetwork/utils'; -import { isGasPriceSafe } from '../ethereum-utils'; +import { isGasPriceSafe } from '../ethereum-utils.js'; // Maximum number of api requests to retry when an error is encountered (ECONNRESET, EPIPE, ENOTFOUND) const ETHERCHAIN_REQUEST_MAX_RETRY = 3; diff --git a/packages/ethereum-storage/src/gas-price-providers/etherscan-provider.ts b/packages/ethereum-storage/src/gas-price-providers/etherscan-provider.ts index 40272bdeef..46ead240dd 100644 --- a/packages/ethereum-storage/src/gas-price-providers/etherscan-provider.ts +++ b/packages/ethereum-storage/src/gas-price-providers/etherscan-provider.ts @@ -4,7 +4,7 @@ import Axios from 'axios'; import { BigNumber } from 'ethers'; import { retry } from '@requestnetwork/utils'; -import { isGasPriceSafe } from '../ethereum-utils'; +import { isGasPriceSafe } from '../ethereum-utils.js'; // Maximum number of api requests to retry when an error is encountered (ECONNRESET, EPIPE, ENOTFOUND) const ETHERSCAN_REQUEST_MAX_RETRY = 3; diff --git a/packages/ethereum-storage/src/gas-price-providers/ethgasstation-provider.ts b/packages/ethereum-storage/src/gas-price-providers/ethgasstation-provider.ts index 65c5146061..830f0e4a50 100644 --- a/packages/ethereum-storage/src/gas-price-providers/ethgasstation-provider.ts +++ b/packages/ethereum-storage/src/gas-price-providers/ethgasstation-provider.ts @@ -3,7 +3,7 @@ import Axios from 'axios'; import { BigNumber } from 'ethers'; import { retry } from '@requestnetwork/utils'; -import { isGasPriceSafe } from '../ethereum-utils'; +import { isGasPriceSafe } from '../ethereum-utils.js'; // Maximum number of api requests to retry when an error is encountered (ECONNRESET, EPIPE, ENOTFOUND) const ETHGASSTATION_REQUEST_MAX_RETRY = 3; diff --git a/packages/ethereum-storage/src/ignored-dataIds.ts b/packages/ethereum-storage/src/ignored-dataIds.ts index aa37f1216b..f1ee210172 100644 --- a/packages/ethereum-storage/src/ignored-dataIds.ts +++ b/packages/ethereum-storage/src/ignored-dataIds.ts @@ -1,4 +1,4 @@ -import * as Keyv from 'keyv'; +import Keyv from 'keyv'; import { StorageTypes } from '@requestnetwork/types'; diff --git a/packages/ethereum-storage/src/index.ts b/packages/ethereum-storage/src/index.ts index a80514931c..6a2a30ca71 100644 --- a/packages/ethereum-storage/src/index.ts +++ b/packages/ethereum-storage/src/index.ts @@ -1,10 +1,10 @@ -export { EthereumStorage } from './ethereum-storage'; +export { EthereumStorage } from './ethereum-storage.js'; export { getEthereumStorageNetworkNameFromId, getEthereumStorageNetworkIdFromName, -} from './ethereum-utils'; -export { EthereumStorageEthers } from './ethereum-storage-ethers'; -export { EthereumTransactionSubmitter } from './ethereum-tx-submitter'; -export { GasPriceDefiner } from './gas-price-definer'; -export { GasFeeDefiner } from './gas-fee-definer'; -export { IpfsStorage } from './ipfs-storage'; +} from './ethereum-utils.js'; +export { EthereumStorageEthers } from './ethereum-storage-ethers.js'; +export { EthereumTransactionSubmitter } from './ethereum-tx-submitter.js'; +export { GasPriceDefiner } from './gas-price-definer.js'; +export { GasFeeDefiner } from './gas-fee-definer.js'; +export { IpfsStorage } from './ipfs-storage.js'; diff --git a/packages/ethereum-storage/src/ipfs-manager.ts b/packages/ethereum-storage/src/ipfs-manager.ts index a4d2cd8484..a3961b0a9a 100644 --- a/packages/ethereum-storage/src/ipfs-manager.ts +++ b/packages/ethereum-storage/src/ipfs-manager.ts @@ -3,8 +3,8 @@ import * as qs from 'qs'; import axios, { AxiosError, AxiosInstance, AxiosRequestConfig } from 'axios'; import { LogTypes, StorageTypes } from '@requestnetwork/types'; -import { getDefaultIpfs, getIpfsErrorHandlingConfig } from './config'; -import * as FormData from 'form-data'; +import { getDefaultIpfs, getIpfsErrorHandlingConfig } from './config.js'; +import FormData from 'form-data'; import { retry, SimpleLogger } from '@requestnetwork/utils'; /** A mapping between IPFS Paths and the response type */ diff --git a/packages/ethereum-storage/src/ipfs-storage.ts b/packages/ethereum-storage/src/ipfs-storage.ts index 6df4a11b1a..80f9dfd36a 100644 --- a/packages/ethereum-storage/src/ipfs-storage.ts +++ b/packages/ethereum-storage/src/ipfs-storage.ts @@ -1,7 +1,7 @@ import { LogTypes, StorageTypes } from '@requestnetwork/types'; -import { getIpfsExpectedBootstrapNodes, getPinRequestConfig } from './config'; -import IpfsManager from './ipfs-manager'; +import { getIpfsExpectedBootstrapNodes, getPinRequestConfig } from './config.js'; +import IpfsManager from './ipfs-manager.js'; import { SimpleLogger } from '@requestnetwork/utils'; export type IpfsStorageProps = { diff --git a/packages/ethereum-storage/src/smart-contract-manager.ts b/packages/ethereum-storage/src/smart-contract-manager.ts index 10765f588f..f24393298a 100644 --- a/packages/ethereum-storage/src/smart-contract-manager.ts +++ b/packages/ethereum-storage/src/smart-contract-manager.ts @@ -1,9 +1,9 @@ import * as SmartContracts from '@requestnetwork/smart-contracts'; import { CurrencyTypes, LogTypes, StorageTypes } from '@requestnetwork/types'; -import * as Bluebird from 'bluebird'; -import * as config from './config'; -import EthereumBlocks from './ethereum-blocks'; -import { GasPriceDefiner } from './gas-price-definer'; +import Bluebird from 'bluebird'; +import * as config from './config.js'; +import EthereumBlocks from './ethereum-blocks.js'; +import { GasPriceDefiner } from './gas-price-definer.js'; import { BigNumber } from 'ethers'; import { flatten2DimensionsArray, @@ -11,7 +11,7 @@ import { SimpleLogger, timeoutPromise, } from '@requestnetwork/utils'; -import { getEthereumStorageNetworkNameFromId } from './ethereum-utils'; +import { getEthereumStorageNetworkNameFromId } from './ethereum-utils.js'; // eslint-disable-next-line @typescript-eslint/no-var-requires const web3Eth = require('web3-eth'); diff --git a/packages/ethereum-storage/test/dataids-ignored.test.ts b/packages/ethereum-storage/test/dataids-ignored.test.ts index 4eb1f8e526..ff20e25765 100644 --- a/packages/ethereum-storage/test/dataids-ignored.test.ts +++ b/packages/ethereum-storage/test/dataids-ignored.test.ts @@ -1,5 +1,5 @@ import { StorageTypes } from '@requestnetwork/types'; -import IgnoredDataIds from '../src/ignored-dataIds'; +import IgnoredDataIds from '../src/ignored-dataIds.js'; const entry: StorageTypes.IEthereumEntry = { error: { diff --git a/packages/ethereum-storage/test/ethereum-blocks.test.ts b/packages/ethereum-storage/test/ethereum-blocks.test.ts index 375f8168a1..e524625b51 100644 --- a/packages/ethereum-storage/test/ethereum-blocks.test.ts +++ b/packages/ethereum-storage/test/ethereum-blocks.test.ts @@ -1,4 +1,4 @@ -import EthereumBlocks from '../src/ethereum-blocks'; +import EthereumBlocks from '../src/ethereum-blocks.js'; /* eslint-disable no-magic-numbers */ const mockBlocksEthereum = [ diff --git a/packages/ethereum-storage/test/ethereum-entries-to-ipfs-content.test.ts b/packages/ethereum-storage/test/ethereum-entries-to-ipfs-content.test.ts index 2ba90d6a04..41274dbcdc 100644 --- a/packages/ethereum-storage/test/ethereum-entries-to-ipfs-content.test.ts +++ b/packages/ethereum-storage/test/ethereum-entries-to-ipfs-content.test.ts @@ -1,9 +1,9 @@ import { StorageTypes } from '@requestnetwork/types'; import { SimpleLogger } from '@requestnetwork/utils'; -import ethereumEntriesToIpfsContent from '../src/ethereum-entries-to-ipfs-content'; -import IgnoredDataIndex from '../src/ignored-dataIds'; -import IpfsConnectionError from '../src/ipfs-connection-error'; +import ethereumEntriesToIpfsContent from '../src/ethereum-entries-to-ipfs-content.js'; +import IgnoredDataIndex from '../src/ignored-dataIds.js'; +import IpfsConnectionError from '../src/ipfs-connection-error.js'; /* eslint-disable no-magic-numbers */ diff --git a/packages/ethereum-storage/test/ethereum-metadata-cache.test.ts b/packages/ethereum-storage/test/ethereum-metadata-cache.test.ts index 713818bbe7..b8889d32e7 100644 --- a/packages/ethereum-storage/test/ethereum-metadata-cache.test.ts +++ b/packages/ethereum-storage/test/ethereum-metadata-cache.test.ts @@ -1,5 +1,5 @@ import { StorageTypes } from '@requestnetwork/types'; -import EthereumMetadataCache from '../src/ethereum-metadata-cache'; +import EthereumMetadataCache from '../src/ethereum-metadata-cache.js'; let metadataCache: EthereumMetadataCache; diff --git a/packages/ethereum-storage/test/ethereum-storage.test.ts b/packages/ethereum-storage/test/ethereum-storage.test.ts index bcc4ffa622..8e6542ea93 100644 --- a/packages/ethereum-storage/test/ethereum-storage.test.ts +++ b/packages/ethereum-storage/test/ethereum-storage.test.ts @@ -3,9 +3,9 @@ import { StorageTypes } from '@requestnetwork/types'; import { getCurrentTimestampInSecond } from '@requestnetwork/utils'; import { EventEmitter } from 'events'; -import { EthereumStorage } from '../src/ethereum-storage'; -import { IpfsStorage } from '../src/ipfs-storage'; -import IpfsConnectionError from '../src/ipfs-connection-error'; +import { EthereumStorage } from '../src/ethereum-storage.js'; +import { IpfsStorage } from '../src/ipfs-storage.js'; +import IpfsConnectionError from '../src/ipfs-connection-error.js'; /* eslint-disable no-magic-numbers */ diff --git a/packages/ethereum-storage/test/ethereum-utils.test.ts b/packages/ethereum-storage/test/ethereum-utils.test.ts index 72b5bd21ce..70646bd488 100644 --- a/packages/ethereum-storage/test/ethereum-utils.test.ts +++ b/packages/ethereum-storage/test/ethereum-utils.test.ts @@ -1,12 +1,12 @@ import { StorageTypes } from '@requestnetwork/types'; -import { getSafeGasPriceLimit } from '../src/config'; +import { getSafeGasPriceLimit } from '../src/config.js'; import { BigNumber } from 'ethers'; import { getEthereumStorageNetworkIdFromName, getEthereumStorageNetworkNameFromId, isGasPriceSafe, -} from '../src/ethereum-utils'; +} from '../src/ethereum-utils.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/ethereum-storage/test/gas-fee-definer.test.ts b/packages/ethereum-storage/test/gas-fee-definer.test.ts index 085fc14b9e..6f39416719 100644 --- a/packages/ethereum-storage/test/gas-fee-definer.test.ts +++ b/packages/ethereum-storage/test/gas-fee-definer.test.ts @@ -1,4 +1,4 @@ -import { GasFeeDefiner } from '../src/gas-fee-definer'; +import { GasFeeDefiner } from '../src/gas-fee-definer.js'; import { BigNumber, providers, Wallet } from 'ethers'; jest.setTimeout(10000); diff --git a/packages/ethereum-storage/test/gas-price-definer.test.ts b/packages/ethereum-storage/test/gas-price-definer.test.ts index 8f19e3e317..638472506d 100644 --- a/packages/ethereum-storage/test/gas-price-definer.test.ts +++ b/packages/ethereum-storage/test/gas-price-definer.test.ts @@ -1,9 +1,9 @@ /* eslint-disable no-magic-numbers */ import { StorageTypes } from '@requestnetwork/types'; -import { GasPriceDefiner, getEthereumStorageNetworkNameFromId } from '../src'; +import { GasPriceDefiner, getEthereumStorageNetworkNameFromId } from '../src/index.js'; -import * as config from '../src/config'; +import * as config from '../src/config.js'; import { BigNumber } from 'ethers'; diff --git a/packages/ethereum-storage/test/gas-price-providers/etherchain-provider.test.ts b/packages/ethereum-storage/test/gas-price-providers/etherchain-provider.test.ts index 083a27e85e..8133f4632c 100644 --- a/packages/ethereum-storage/test/gas-price-providers/etherchain-provider.test.ts +++ b/packages/ethereum-storage/test/gas-price-providers/etherchain-provider.test.ts @@ -1,7 +1,7 @@ /* eslint-disable no-magic-numbers */ import { StorageTypes } from '@requestnetwork/types'; -import EtherchainProvider from '../../src/gas-price-providers/etherchain-provider'; +import EtherchainProvider from '../../src/gas-price-providers/etherchain-provider.js'; import axios from 'axios'; diff --git a/packages/ethereum-storage/test/gas-price-providers/etherscan-provider.test.ts b/packages/ethereum-storage/test/gas-price-providers/etherscan-provider.test.ts index b707c6cb72..7de2aa99ef 100644 --- a/packages/ethereum-storage/test/gas-price-providers/etherscan-provider.test.ts +++ b/packages/ethereum-storage/test/gas-price-providers/etherscan-provider.test.ts @@ -1,6 +1,6 @@ /* eslint-disable no-magic-numbers */ import { StorageTypes } from '@requestnetwork/types'; -import EtherscanProvider from '../../src/gas-price-providers/etherscan-provider'; +import EtherscanProvider from '../../src/gas-price-providers/etherscan-provider.js'; import axios from 'axios'; diff --git a/packages/ethereum-storage/test/gas-price-providers/ethgasstation-provider.test.ts b/packages/ethereum-storage/test/gas-price-providers/ethgasstation-provider.test.ts index 52051d1d79..57b11d5947 100644 --- a/packages/ethereum-storage/test/gas-price-providers/ethgasstation-provider.test.ts +++ b/packages/ethereum-storage/test/gas-price-providers/ethgasstation-provider.test.ts @@ -1,7 +1,7 @@ /* eslint-disable no-magic-numbers */ import { StorageTypes } from '@requestnetwork/types'; -import EthGasStationProvider from '../../src/gas-price-providers/ethgasstation-provider'; +import EthGasStationProvider from '../../src/gas-price-providers/ethgasstation-provider.js'; import Axios from 'axios'; diff --git a/packages/ethereum-storage/test/gas-price-providers/xdai-fixed-provider.test.ts b/packages/ethereum-storage/test/gas-price-providers/xdai-fixed-provider.test.ts index eddb5de230..cee398fd07 100644 --- a/packages/ethereum-storage/test/gas-price-providers/xdai-fixed-provider.test.ts +++ b/packages/ethereum-storage/test/gas-price-providers/xdai-fixed-provider.test.ts @@ -1,6 +1,6 @@ import { StorageTypes } from '@requestnetwork/types'; import { BigNumber } from 'ethers'; -import XDaiFixedProvider from '../../src/gas-price-providers/xdai-fixed-provider'; +import XDaiFixedProvider from '../../src/gas-price-providers/xdai-fixed-provider.js'; describe('XDaiFixedProvider', () => { describe('getGasPrice', () => { diff --git a/packages/ethereum-storage/test/ipfs-manager.test.ts b/packages/ethereum-storage/test/ipfs-manager.test.ts index 565524debc..23b7a4c1ac 100644 --- a/packages/ethereum-storage/test/ipfs-manager.test.ts +++ b/packages/ethereum-storage/test/ipfs-manager.test.ts @@ -1,5 +1,5 @@ import { StorageTypes } from '@requestnetwork/types'; -import IpfsManager from '../src/ipfs-manager'; +import IpfsManager from '../src/ipfs-manager.js'; import { AxiosInstance } from 'axios'; import MockAdapter from 'axios-mock-adapter'; diff --git a/packages/ethereum-storage/test/ipfs-storage.test.ts b/packages/ethereum-storage/test/ipfs-storage.test.ts index 9fe96a94ae..4b86508624 100644 --- a/packages/ethereum-storage/test/ipfs-storage.test.ts +++ b/packages/ethereum-storage/test/ipfs-storage.test.ts @@ -1,5 +1,5 @@ import { StorageTypes } from '@requestnetwork/types'; -import { IpfsStorage } from '../src/ipfs-storage'; +import { IpfsStorage } from '../src/ipfs-storage.js'; const ipfsGatewayConnection: StorageTypes.IIpfsGatewayConnection = { host: 'localhost', diff --git a/packages/ethereum-storage/test/smartcontract-manager.test.ts b/packages/ethereum-storage/test/smartcontract-manager.test.ts index 597a00c1fd..ee85a2eeee 100644 --- a/packages/ethereum-storage/test/smartcontract-manager.test.ts +++ b/packages/ethereum-storage/test/smartcontract-manager.test.ts @@ -1,7 +1,7 @@ import * as SmartContracts from '@requestnetwork/smart-contracts'; import { CurrencyTypes, StorageTypes } from '@requestnetwork/types'; -import EthereumBlocks from '../src/ethereum-blocks'; -import SmartContractManager from '../src/smart-contract-manager'; +import EthereumBlocks from '../src/ethereum-blocks.js'; +import SmartContractManager from '../src/smart-contract-manager.js'; /* eslint-disable no-magic-numbers */ diff --git a/packages/integration-test/package.json b/packages/integration-test/package.json index 01ab0c5dba..ad08990b11 100644 --- a/packages/integration-test/package.json +++ b/packages/integration-test/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/integration-test", "version": "0.30.0", + "type": "module", "private": true, "description": "Integration tests for the request system.", "keywords": [ diff --git a/packages/integration-test/test/node-client.test.ts b/packages/integration-test/test/node-client.test.ts index a4a6fc286a..450af69937 100644 --- a/packages/integration-test/test/node-client.test.ts +++ b/packages/integration-test/test/node-client.test.ts @@ -22,7 +22,7 @@ import { payerIdentity, requestNetwork, signatureProvider, -} from './scheduled/fixtures'; +} from './scheduled/fixtures.js'; import { getCurrentTimestampInSecond, normalizeKeccak256Hash } from '@requestnetwork/utils'; const mnemonic = 'candy maple cake sugar pudding cream honey rich smooth crumble sweet treat'; diff --git a/packages/integration-test/test/scheduled/any-to-erc20-detector.test.ts b/packages/integration-test/test/scheduled/any-to-erc20-detector.test.ts index 4c4873875b..83d70e26de 100644 --- a/packages/integration-test/test/scheduled/any-to-erc20-detector.test.ts +++ b/packages/integration-test/test/scheduled/any-to-erc20-detector.test.ts @@ -2,8 +2,8 @@ import { PaymentNetworkFactory } from '@requestnetwork/payment-detection'; import { CurrencyTypes, PaymentTypes, RequestLogicTypes } from '@requestnetwork/types'; import { CurrencyManager } from '@requestnetwork/currency'; -import { mockAdvancedLogic } from './mocks'; -import { createMockConversionErc20Request } from '../utils'; +import { mockAdvancedLogic } from './mocks.js'; +import { createMockConversionErc20Request } from '../utils.js'; const pnFactory = new PaymentNetworkFactory(mockAdvancedLogic, CurrencyManager.getDefault()); diff --git a/packages/integration-test/test/scheduled/any-to-eth-detector.test.ts b/packages/integration-test/test/scheduled/any-to-eth-detector.test.ts index c1e71e5547..d9c6bc93aa 100644 --- a/packages/integration-test/test/scheduled/any-to-eth-detector.test.ts +++ b/packages/integration-test/test/scheduled/any-to-eth-detector.test.ts @@ -2,8 +2,8 @@ import { PaymentNetworkFactory } from '@requestnetwork/payment-detection'; import { CurrencyTypes, PaymentTypes, RequestLogicTypes } from '@requestnetwork/types'; import { CurrencyManager } from '@requestnetwork/currency'; -import { mockAdvancedLogic } from './mocks'; -import { createMockConversionEthTokenRequest } from '../utils'; +import { mockAdvancedLogic } from './mocks.js'; +import { createMockConversionEthTokenRequest } from '../utils.js'; const pnFactory = new PaymentNetworkFactory(mockAdvancedLogic, CurrencyManager.getDefault()); diff --git a/packages/integration-test/test/scheduled/btc.test.ts b/packages/integration-test/test/scheduled/btc.test.ts index ddda39db80..83957f4858 100644 --- a/packages/integration-test/test/scheduled/btc.test.ts +++ b/packages/integration-test/test/scheduled/btc.test.ts @@ -1,7 +1,7 @@ import { EthereumPrivateKeySignatureProvider } from '@requestnetwork/epk-signature'; import { RequestNetwork } from '@requestnetwork/request-client.js'; import { PaymentTypes, SignatureTypes, ExtensionTypes } from '@requestnetwork/types'; -import { payee, requestData, testnetRequestData } from './btc-test-data'; +import { payee, requestData, testnetRequestData } from './btc-test-data.js'; const signatureProvider = new EthereumPrivateKeySignatureProvider({ method: SignatureTypes.METHOD.ECDSA, diff --git a/packages/integration-test/test/scheduled/erc20-address-based.test.ts b/packages/integration-test/test/scheduled/erc20-address-based.test.ts index ae8c93d1e9..b37ee20d52 100644 --- a/packages/integration-test/test/scheduled/erc20-address-based.test.ts +++ b/packages/integration-test/test/scheduled/erc20-address-based.test.ts @@ -4,8 +4,8 @@ import { Erc20PaymentNetwork } from '@requestnetwork/payment-detection'; import ERC20AddressBasedInfoRetriever from '@requestnetwork/payment-detection/src/erc20/address-based-info-retriever'; import { ExtensionTypes, PaymentTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { account, tokens } from './erc20-mainnet-test-data'; -import { mockAdvancedLogic } from './mocks'; +import { account, tokens } from './erc20-mainnet-test-data.js'; +import { mockAdvancedLogic } from './mocks.js'; describe('ERC20 Address Based detection test-suite', () => { describe('check mainnet payment detection', () => { diff --git a/packages/integration-test/test/scheduled/erc20-fee-proxy.test.ts b/packages/integration-test/test/scheduled/erc20-fee-proxy.test.ts index ad4393ed33..7816fba2cb 100644 --- a/packages/integration-test/test/scheduled/erc20-fee-proxy.test.ts +++ b/packages/integration-test/test/scheduled/erc20-fee-proxy.test.ts @@ -3,7 +3,7 @@ import { PaymentNetworkFactory } from '@requestnetwork/payment-detection'; import { CurrencyTypes, PaymentTypes, RequestLogicTypes } from '@requestnetwork/types'; import { Types, Utils } from '@requestnetwork/request-client.js'; -import { mockAdvancedLogic } from './mocks'; +import { mockAdvancedLogic } from './mocks.js'; import { erc20requestCreationHash, localErc20PaymentNetworkParams, @@ -11,8 +11,8 @@ import { payerIdentity, privateErc20Address, requestNetwork, -} from './fixtures'; -import { createMockErc20FeeRequest } from '../utils'; +} from './fixtures.js'; +import { createMockErc20FeeRequest } from '../utils.js'; const pnFactory = new PaymentNetworkFactory(mockAdvancedLogic, CurrencyManager.getDefault()); diff --git a/packages/integration-test/test/scheduled/erc20-proxy.test.ts b/packages/integration-test/test/scheduled/erc20-proxy.test.ts index 36a0d54257..a9ffe0cf2f 100644 --- a/packages/integration-test/test/scheduled/erc20-proxy.test.ts +++ b/packages/integration-test/test/scheduled/erc20-proxy.test.ts @@ -1,7 +1,7 @@ import { Erc20PaymentNetwork } from '@requestnetwork/payment-detection'; import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { mockAdvancedLogic } from './mocks'; +import { mockAdvancedLogic } from './mocks.js'; import { Types, Utils } from '@requestnetwork/request-client.js'; import { CurrencyManager } from '@requestnetwork/currency'; import { @@ -11,7 +11,7 @@ import { payerIdentity, privateErc20Address, requestNetwork, -} from './fixtures'; +} from './fixtures.js'; const erc20ProxyAddressedBased = new Erc20PaymentNetwork.ERC20ProxyPaymentDetector({ advancedLogic: mockAdvancedLogic, diff --git a/packages/integration-test/test/scheduled/erc777-stream.test.ts b/packages/integration-test/test/scheduled/erc777-stream.test.ts index a57d187432..45b1d272d6 100644 --- a/packages/integration-test/test/scheduled/erc777-stream.test.ts +++ b/packages/integration-test/test/scheduled/erc777-stream.test.ts @@ -8,7 +8,7 @@ import { } from '@requestnetwork/types'; import { CurrencyManager } from '@requestnetwork/currency'; -import { mockAdvancedLogic } from './mocks'; +import { mockAdvancedLogic } from './mocks.js'; const createMockRequest = ({ network, diff --git a/packages/integration-test/test/scheduled/escrow-detector.test.ts b/packages/integration-test/test/scheduled/escrow-detector.test.ts index 0f1aca9df4..3ce9aabbb3 100644 --- a/packages/integration-test/test/scheduled/escrow-detector.test.ts +++ b/packages/integration-test/test/scheduled/escrow-detector.test.ts @@ -1,7 +1,7 @@ import { Erc20PaymentNetwork } from '@requestnetwork/payment-detection'; import { CurrencyManager } from '@requestnetwork/currency'; -import { createMockErc20FeeRequest } from '../utils'; -import { mockAdvancedLogic } from './mocks'; +import { createMockErc20FeeRequest } from '../utils.js'; +import { mockAdvancedLogic } from './mocks.js'; const feeProxyDetector = new Erc20PaymentNetwork.ERC20FeeProxyPaymentDetector({ advancedLogic: mockAdvancedLogic, diff --git a/packages/integration-test/test/scheduled/eth-input-data.test.ts b/packages/integration-test/test/scheduled/eth-input-data.test.ts index b871464b16..c3e582d30a 100644 --- a/packages/integration-test/test/scheduled/eth-input-data.test.ts +++ b/packages/integration-test/test/scheduled/eth-input-data.test.ts @@ -5,7 +5,7 @@ import { import { PaymentTypes, RequestLogicTypes } from '@requestnetwork/types'; import { CurrencyManager } from '@requestnetwork/currency'; -import { mockAdvancedLogic } from './mocks'; +import { mockAdvancedLogic } from './mocks.js'; import { Types, Utils } from '@requestnetwork/request-client.js'; import { ethInputDataCreationHash, @@ -14,8 +14,8 @@ import { payerIdentity, privateErc20Address, requestNetwork, -} from './fixtures'; -import { createMockNativeTokenRequest } from '../utils'; +} from './fixtures.js'; +import { createMockNativeTokenRequest } from '../utils.js'; const ethInputContract = new EthInputDataPaymentDetector({ advancedLogic: mockAdvancedLogic, diff --git a/packages/multi-format/package.json b/packages/multi-format/package.json index b86274b17a..321870e4a7 100644 --- a/packages/multi-format/package.json +++ b/packages/multi-format/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/multi-format", "version": "0.15.11", + "type": "module", "publishConfig": { "access": "public" }, diff --git a/packages/multi-format/src/encryption/aes256-cbc-format.ts b/packages/multi-format/src/encryption/aes256-cbc-format.ts index f9eee2e0a0..c2cbb2abe0 100644 --- a/packages/multi-format/src/encryption/aes256-cbc-format.ts +++ b/packages/multi-format/src/encryption/aes256-cbc-format.ts @@ -1,6 +1,6 @@ import { EncryptionTypes, MultiFormatTypes } from '@requestnetwork/types'; -import SerializableMultiFormat from '../serializable-multi-format'; +import SerializableMultiFormat from '../serializable-multi-format.js'; /** * Class to serialize and deserialize multi-format AES-256-CBC encrypted data diff --git a/packages/multi-format/src/encryption/aes256-gcm-format.ts b/packages/multi-format/src/encryption/aes256-gcm-format.ts index 939ceb5e82..e83471f7f2 100644 --- a/packages/multi-format/src/encryption/aes256-gcm-format.ts +++ b/packages/multi-format/src/encryption/aes256-gcm-format.ts @@ -1,6 +1,6 @@ import { EncryptionTypes, MultiFormatTypes } from '@requestnetwork/types'; -import SerializableMultiFormat from '../serializable-multi-format'; +import SerializableMultiFormat from '../serializable-multi-format.js'; /** * Class to serialize and deserialize multi-format AES-256-GCM encrypted data diff --git a/packages/multi-format/src/encryption/ecies-format.ts b/packages/multi-format/src/encryption/ecies-format.ts index edb49694a6..ae6b7f051c 100644 --- a/packages/multi-format/src/encryption/ecies-format.ts +++ b/packages/multi-format/src/encryption/ecies-format.ts @@ -1,6 +1,6 @@ import { EncryptionTypes, MultiFormatTypes } from '@requestnetwork/types'; -import SerializableMultiFormat from '../serializable-multi-format'; +import SerializableMultiFormat from '../serializable-multi-format.js'; /** * Class to serialize and deserialize multi-format AES-256-CBC encrypted data diff --git a/packages/multi-format/src/encryption/encryption-format.ts b/packages/multi-format/src/encryption/encryption-format.ts index 92e92b160e..e53485673e 100644 --- a/packages/multi-format/src/encryption/encryption-format.ts +++ b/packages/multi-format/src/encryption/encryption-format.ts @@ -1,7 +1,7 @@ -import GroupMultiFormat from '../group-multi-format'; -import Aes256Cbc from './aes256-cbc-format'; -import Aes256Gcm from './aes256-gcm-format'; -import Ecies from './ecies-format'; +import GroupMultiFormat from '../group-multi-format.js'; +import Aes256Cbc from './aes256-cbc-format.js'; +import Aes256Gcm from './aes256-gcm-format.js'; +import Ecies from './ecies-format.js'; // group all the multi-format concerning the encryption const group = new GroupMultiFormat([new Aes256Cbc(), new Ecies(), new Aes256Gcm()]); diff --git a/packages/multi-format/src/group-multi-format.ts b/packages/multi-format/src/group-multi-format.ts index 25dbf64858..d24049a0b9 100644 --- a/packages/multi-format/src/group-multi-format.ts +++ b/packages/multi-format/src/group-multi-format.ts @@ -1,6 +1,6 @@ import { MultiFormatTypes } from '@requestnetwork/types'; -import SerializableMultiFormat from './serializable-multi-format'; +import SerializableMultiFormat from './serializable-multi-format.js'; /** * Class to group multi-formats to make the code more maintainable (see index.ts) diff --git a/packages/multi-format/src/hash/hash-format.ts b/packages/multi-format/src/hash/hash-format.ts index 6a187a09fa..3f34f0569e 100644 --- a/packages/multi-format/src/hash/hash-format.ts +++ b/packages/multi-format/src/hash/hash-format.ts @@ -1,5 +1,5 @@ -import GroupMultiFormat from '../group-multi-format'; -import Keccak256 from './keccak256-format'; +import GroupMultiFormat from '../group-multi-format.js'; +import Keccak256 from './keccak256-format.js'; // group all the multi-format concerning the hashing const group = new GroupMultiFormat([new Keccak256()]); diff --git a/packages/multi-format/src/hash/keccak256-format.ts b/packages/multi-format/src/hash/keccak256-format.ts index 23ba39e269..32e043144a 100644 --- a/packages/multi-format/src/hash/keccak256-format.ts +++ b/packages/multi-format/src/hash/keccak256-format.ts @@ -1,6 +1,6 @@ import { MultiFormatTypes } from '@requestnetwork/types'; -import HexadecimalSerializableMultiFormat from '../hexadecimal-serializable-multi-format'; +import HexadecimalSerializableMultiFormat from '../hexadecimal-serializable-multi-format.js'; /** * Class to serialize and deserialize multi-format AES-256-CBC encrypted data diff --git a/packages/multi-format/src/hexadecimal-serializable-multi-format.ts b/packages/multi-format/src/hexadecimal-serializable-multi-format.ts index 0f9fe82804..42df85ec10 100644 --- a/packages/multi-format/src/hexadecimal-serializable-multi-format.ts +++ b/packages/multi-format/src/hexadecimal-serializable-multi-format.ts @@ -1,6 +1,6 @@ import { MultiFormatTypes } from '@requestnetwork/types'; -import SerializableMultiFormat from './serializable-multi-format'; +import SerializableMultiFormat from './serializable-multi-format.js'; /** * Class to serialize and deserialize multi-format data using hexadecimal values diff --git a/packages/multi-format/src/identity/ethereum-address-format.ts b/packages/multi-format/src/identity/ethereum-address-format.ts index 1220b73594..7f334d4308 100644 --- a/packages/multi-format/src/identity/ethereum-address-format.ts +++ b/packages/multi-format/src/identity/ethereum-address-format.ts @@ -1,6 +1,6 @@ import { IdentityTypes, MultiFormatTypes } from '@requestnetwork/types'; -import HexadecimalSerializableMultiFormat from '../hexadecimal-serializable-multi-format'; +import HexadecimalSerializableMultiFormat from '../hexadecimal-serializable-multi-format.js'; /** * Class to serialize and deserialize multi-format identity ethereum address diff --git a/packages/multi-format/src/identity/identity-format.ts b/packages/multi-format/src/identity/identity-format.ts index 78661460a7..e1ab9fb604 100644 --- a/packages/multi-format/src/identity/identity-format.ts +++ b/packages/multi-format/src/identity/identity-format.ts @@ -1,6 +1,6 @@ -import GroupMultiFormat from '../group-multi-format'; +import GroupMultiFormat from '../group-multi-format.js'; -import EthereumAddressFormat from './ethereum-address-format'; +import EthereumAddressFormat from './ethereum-address-format.js'; // group all the multi-format concerning identities const group = new GroupMultiFormat([new EthereumAddressFormat()]); diff --git a/packages/multi-format/src/index.ts b/packages/multi-format/src/index.ts index 29f7c45425..bc87589c6c 100644 --- a/packages/multi-format/src/index.ts +++ b/packages/multi-format/src/index.ts @@ -1,10 +1,10 @@ import { MultiFormatTypes } from '@requestnetwork/types'; -import encryptionFormats from './encryption/encryption-format'; -import GroupMultiFormat from './group-multi-format'; -import hashFormat from './hash/hash-format'; -import identityFormat from './identity/identity-format'; -import plainFormat from './plain/plain-format'; +import encryptionFormats from './encryption/encryption-format.js'; +import GroupMultiFormat from './group-multi-format.js'; +import hashFormat from './hash/hash-format.js'; +import identityFormat from './identity/identity-format.js'; +import plainFormat from './plain/plain-format.js'; /** Serializes and deserializes any multi-format supported */ export default { diff --git a/packages/multi-format/src/plain/plain-format.ts b/packages/multi-format/src/plain/plain-format.ts index 1f6af4f20c..47ad63d35b 100644 --- a/packages/multi-format/src/plain/plain-format.ts +++ b/packages/multi-format/src/plain/plain-format.ts @@ -1,5 +1,5 @@ -import GroupMultiFormat from '../group-multi-format'; -import PlainText from './plain-text-format'; +import GroupMultiFormat from '../group-multi-format.js'; +import PlainText from './plain-text-format.js'; // group all the multi-format concerning plain data const group = new GroupMultiFormat([new PlainText()]); diff --git a/packages/multi-format/src/plain/plain-text-format.ts b/packages/multi-format/src/plain/plain-text-format.ts index 4187509ce5..e3c30a6eff 100644 --- a/packages/multi-format/src/plain/plain-text-format.ts +++ b/packages/multi-format/src/plain/plain-text-format.ts @@ -1,6 +1,6 @@ import { MultiFormatTypes } from '@requestnetwork/types'; -import SerializableMultiFormat from '../serializable-multi-format'; +import SerializableMultiFormat from '../serializable-multi-format.js'; /** * Class to serialize and deserialize multi-format plain text diff --git a/packages/multi-format/test/encryption/aes256-cbc-format.test.ts b/packages/multi-format/test/encryption/aes256-cbc-format.test.ts index a700585425..cd3d734c36 100644 --- a/packages/multi-format/test/encryption/aes256-cbc-format.test.ts +++ b/packages/multi-format/test/encryption/aes256-cbc-format.test.ts @@ -1,6 +1,6 @@ import { EncryptionTypes, MultiFormatTypes } from '@requestnetwork/types'; -import Aes256CbcFormat from '../../src/encryption/aes256-cbc-format'; +import Aes256CbcFormat from '../../src/encryption/aes256-cbc-format.js'; let aes256CbcFormat: Aes256CbcFormat; /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/multi-format/test/encryption/ecies-format.test.ts b/packages/multi-format/test/encryption/ecies-format.test.ts index db6c6794ef..1880b48397 100644 --- a/packages/multi-format/test/encryption/ecies-format.test.ts +++ b/packages/multi-format/test/encryption/ecies-format.test.ts @@ -1,6 +1,6 @@ import { EncryptionTypes, MultiFormatTypes } from '@requestnetwork/types'; -import EciesFormat from '../../src/encryption/ecies-format'; +import EciesFormat from '../../src/encryption/ecies-format.js'; let eciesFormat: EciesFormat; /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/multi-format/test/hash/keccak256-format.test.ts b/packages/multi-format/test/hash/keccak256-format.test.ts index 19dd9904be..0c2b9428f9 100644 --- a/packages/multi-format/test/hash/keccak256-format.test.ts +++ b/packages/multi-format/test/hash/keccak256-format.test.ts @@ -1,6 +1,6 @@ import { MultiFormatTypes } from '@requestnetwork/types'; -import Keccak256Format from '../../src/hash/keccak256-format'; +import Keccak256Format from '../../src/hash/keccak256-format.js'; let keccak256Format: Keccak256Format; diff --git a/packages/multi-format/test/idenity/ethereum-address-format.test.ts b/packages/multi-format/test/idenity/ethereum-address-format.test.ts index a0ae89f080..2d313aed2d 100644 --- a/packages/multi-format/test/idenity/ethereum-address-format.test.ts +++ b/packages/multi-format/test/idenity/ethereum-address-format.test.ts @@ -1,6 +1,6 @@ import { IdentityTypes, MultiFormatTypes } from '@requestnetwork/types'; -import EthereumAddressFormat from '../../src/identity/ethereum-address-format'; +import EthereumAddressFormat from '../../src/identity/ethereum-address-format.js'; let ethereumAddressFormat: EthereumAddressFormat; diff --git a/packages/multi-format/test/index.test.ts b/packages/multi-format/test/index.test.ts index 264c5e6f07..0b6e01a450 100644 --- a/packages/multi-format/test/index.test.ts +++ b/packages/multi-format/test/index.test.ts @@ -1,6 +1,6 @@ import { MultiFormatTypes } from '@requestnetwork/types'; -import MultiFormat from '../src/index'; +import MultiFormat from '../src/index.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ describe('Utils.multiFormat', () => { diff --git a/packages/multi-format/test/plain/plain-text-format.test.ts b/packages/multi-format/test/plain/plain-text-format.test.ts index b4891b1507..95c3b900d8 100644 --- a/packages/multi-format/test/plain/plain-text-format.test.ts +++ b/packages/multi-format/test/plain/plain-text-format.test.ts @@ -1,6 +1,6 @@ import { MultiFormatTypes } from '@requestnetwork/types'; -import PlainTextFormat from '../../src/plain/plain-text-format'; +import PlainTextFormat from '../../src/plain/plain-text-format.js'; let plainTextFormat: PlainTextFormat; diff --git a/packages/payment-detection/package.json b/packages/payment-detection/package.json index 2ec7868c79..4705d634c8 100644 --- a/packages/payment-detection/package.json +++ b/packages/payment-detection/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/payment-detection", "version": "0.37.0", + "type": "module", "publishConfig": { "access": "public" }, @@ -45,7 +46,7 @@ "@requestnetwork/smart-contracts": "0.30.0", "@requestnetwork/types": "0.37.0", "@requestnetwork/utils": "0.37.0", - "axios": "0.27.2", + "axios": "1.5.1", "ethers": "5.5.1", "graphql": "15.5.1", "graphql-request": "3.4.0", diff --git a/packages/payment-detection/src/any-to-any-detector.ts b/packages/payment-detection/src/any-to-any-detector.ts index 1e135712fc..0172c912f0 100644 --- a/packages/payment-detection/src/any-to-any-detector.ts +++ b/packages/payment-detection/src/any-to-any-detector.ts @@ -1,5 +1,5 @@ import { ExtensionTypes } from '@requestnetwork/types'; -import { FeeReferenceBasedDetector } from './fee-reference-based-detector'; +import { FeeReferenceBasedDetector } from './fee-reference-based-detector.js'; import { ICurrencyManager } from '@requestnetwork/currency'; import { generate8randomBytes } from '@requestnetwork/utils'; diff --git a/packages/payment-detection/src/any-to-native-detector.ts b/packages/payment-detection/src/any-to-native-detector.ts index 1174431174..5a5b13e29c 100644 --- a/packages/payment-detection/src/any-to-native-detector.ts +++ b/packages/payment-detection/src/any-to-native-detector.ts @@ -1,7 +1,7 @@ import { ExtensionTypes, PaymentTypes } from '@requestnetwork/types'; -import { AnyToAnyDetector } from './any-to-any-detector'; -import { NativeDetectorOptions } from './types'; +import { AnyToAnyDetector } from './any-to-any-detector.js'; +import { NativeDetectorOptions } from './types.js'; /** * Handle payment detection for native token payment with conversion diff --git a/packages/payment-detection/src/any/any-to-erc20-proxy.ts b/packages/payment-detection/src/any/any-to-erc20-proxy.ts index e55f22fcf8..b43e6a10ae 100644 --- a/packages/payment-detection/src/any/any-to-erc20-proxy.ts +++ b/packages/payment-detection/src/any/any-to-erc20-proxy.ts @@ -5,11 +5,15 @@ import { PaymentTypes, RequestLogicTypes, } from '@requestnetwork/types'; -import { ERC20FeeProxyPaymentDetectorBase } from '../erc20/fee-proxy-contract'; -import { AnyToErc20InfoRetriever } from './retrievers/any-to-erc20-proxy'; -import { TheGraphConversionInfoRetriever } from '../thegraph/conversion-info-retriever'; -import { makeGetDeploymentInformation } from '../utils'; -import { PaymentNetworkOptions, ReferenceBasedDetectorOptions, TGetSubGraphClient } from '../types'; +import { ERC20FeeProxyPaymentDetectorBase } from '../erc20/fee-proxy-contract.js'; +import { AnyToErc20InfoRetriever } from './retrievers/any-to-erc20-proxy.js'; +import { TheGraphConversionInfoRetriever } from '../thegraph/conversion-info-retriever.js'; +import { makeGetDeploymentInformation } from '../utils.js'; +import { + PaymentNetworkOptions, + ReferenceBasedDetectorOptions, + TGetSubGraphClient, +} from '../types.js'; import { generate8randomBytes } from '@requestnetwork/utils'; import { EvmChains } from '@requestnetwork/currency'; diff --git a/packages/payment-detection/src/any/any-to-eth-proxy.ts b/packages/payment-detection/src/any/any-to-eth-proxy.ts index f66b6cbde5..f66ad2b7f3 100644 --- a/packages/payment-detection/src/any/any-to-eth-proxy.ts +++ b/packages/payment-detection/src/any/any-to-eth-proxy.ts @@ -8,11 +8,15 @@ import { import { EvmChains, UnsupportedCurrencyError } from '@requestnetwork/currency'; -import { AnyToEthInfoRetriever } from './retrievers/any-to-eth-proxy'; -import { AnyToAnyDetector } from '../any-to-any-detector'; -import { makeGetDeploymentInformation } from '../utils'; -import { TheGraphConversionInfoRetriever } from '../thegraph/conversion-info-retriever'; -import { PaymentNetworkOptions, ReferenceBasedDetectorOptions, TGetSubGraphClient } from '../types'; +import { AnyToEthInfoRetriever } from './retrievers/any-to-eth-proxy.js'; +import { AnyToAnyDetector } from '../any-to-any-detector.js'; +import { makeGetDeploymentInformation } from '../utils.js'; +import { TheGraphConversionInfoRetriever } from '../thegraph/conversion-info-retriever.js'; +import { + PaymentNetworkOptions, + ReferenceBasedDetectorOptions, + TGetSubGraphClient, +} from '../types.js'; // interface of the object indexing the proxy contract version interface IProxyContractVersion { diff --git a/packages/payment-detection/src/any/index.ts b/packages/payment-detection/src/any/index.ts index a5ef180665..15a8e5a900 100644 --- a/packages/payment-detection/src/any/index.ts +++ b/packages/payment-detection/src/any/index.ts @@ -1,2 +1,2 @@ -export { AnyToERC20PaymentDetector } from './any-to-erc20-proxy'; -export { AnyToEthFeeProxyPaymentDetector } from './any-to-eth-proxy'; +export { AnyToERC20PaymentDetector } from './any-to-erc20-proxy.js'; +export { AnyToEthFeeProxyPaymentDetector } from './any-to-eth-proxy.js'; diff --git a/packages/payment-detection/src/any/retrievers/any-to-any-proxy.ts b/packages/payment-detection/src/any/retrievers/any-to-any-proxy.ts index 3963d2949a..e15346148b 100644 --- a/packages/payment-detection/src/any/retrievers/any-to-any-proxy.ts +++ b/packages/payment-detection/src/any/retrievers/any-to-any-proxy.ts @@ -1,7 +1,7 @@ import { CurrencyDefinition } from '@requestnetwork/currency'; import { PaymentTypes } from '@requestnetwork/types'; import { BigNumber, ethers } from 'ethers'; -import { parseLogArgs, unpadAmountFromChainlink } from '../../utils'; +import { parseLogArgs, unpadAmountFromChainlink } from '../../utils.js'; import type { JsonFragment } from '@ethersproject/abi'; import { getDefaultProvider } from '@requestnetwork/utils'; diff --git a/packages/payment-detection/src/any/retrievers/any-to-erc20-proxy.ts b/packages/payment-detection/src/any/retrievers/any-to-erc20-proxy.ts index 9a2ce4a86c..9d041a133d 100644 --- a/packages/payment-detection/src/any/retrievers/any-to-erc20-proxy.ts +++ b/packages/payment-detection/src/any/retrievers/any-to-erc20-proxy.ts @@ -1,4 +1,4 @@ -import { ConversionInfoRetriever } from './any-to-any-proxy'; +import { ConversionInfoRetriever } from './any-to-any-proxy.js'; import { ethers } from 'ethers'; /** diff --git a/packages/payment-detection/src/any/retrievers/any-to-eth-proxy.ts b/packages/payment-detection/src/any/retrievers/any-to-eth-proxy.ts index db0b2b666d..d83236816d 100644 --- a/packages/payment-detection/src/any/retrievers/any-to-eth-proxy.ts +++ b/packages/payment-detection/src/any/retrievers/any-to-eth-proxy.ts @@ -1,4 +1,4 @@ -import { ConversionInfoRetriever } from './any-to-any-proxy'; +import { ConversionInfoRetriever } from './any-to-any-proxy.js'; import { ethers } from 'ethers'; /** diff --git a/packages/payment-detection/src/btc/address-based.ts b/packages/payment-detection/src/btc/address-based.ts index 007cb7e9d7..f96ee19bd3 100644 --- a/packages/payment-detection/src/btc/address-based.ts +++ b/packages/payment-detection/src/btc/address-based.ts @@ -1,6 +1,6 @@ import { ExtensionTypes, PaymentTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { DefaultBitcoinDetectionProvider } from './default-bitcoin-detection-provider'; -import { PaymentDetectorBase } from '../payment-detector-base'; +import { DefaultBitcoinDetectionProvider } from './default-bitcoin-detection-provider.js'; +import { PaymentDetectorBase } from '../payment-detector-base.js'; /** * Handle payment networks with BTC based address extension diff --git a/packages/payment-detection/src/btc/default-bitcoin-detection-provider.ts b/packages/payment-detection/src/btc/default-bitcoin-detection-provider.ts index 9052a846b8..4b590e2007 100644 --- a/packages/payment-detection/src/btc/default-bitcoin-detection-provider.ts +++ b/packages/payment-detection/src/btc/default-bitcoin-detection-provider.ts @@ -5,7 +5,7 @@ import { BlockStreamInfoProvider, BlockcypherComProvider, ChainSoProvider, -} from './default-providers'; +} from './default-providers.js'; /** * The default Bitcoin detection provider give access to the bitcoin blockchain through several external API's diff --git a/packages/payment-detection/src/btc/default-providers/index.ts b/packages/payment-detection/src/btc/default-providers/index.ts index 8fc95864fe..dffd3dccf0 100644 --- a/packages/payment-detection/src/btc/default-providers/index.ts +++ b/packages/payment-detection/src/btc/default-providers/index.ts @@ -1,4 +1,4 @@ -export { BlockchainInfoProvider } from './blockchain-info'; -export { BlockcypherComProvider } from './blockcypher-com'; -export { BlockStreamInfoProvider } from './blockstream-info'; -export { ChainSoProvider } from './chain-so'; +export { BlockchainInfoProvider } from './blockchain-info.js'; +export { BlockcypherComProvider } from './blockcypher-com.js'; +export { BlockStreamInfoProvider } from './blockstream-info.js'; +export { ChainSoProvider } from './chain-so.js'; diff --git a/packages/payment-detection/src/btc/index.ts b/packages/payment-detection/src/btc/index.ts index b5709369f0..d1b237126b 100644 --- a/packages/payment-detection/src/btc/index.ts +++ b/packages/payment-detection/src/btc/index.ts @@ -1,6 +1,6 @@ -export { BtcMainnetAddressBasedDetector } from './mainnet-address-based'; -export { BtcTestnetAddressBasedDetector } from './testnet-address-based'; -export { DefaultBitcoinDetectionProvider } from './default-bitcoin-detection-provider'; -import * as Providers from './default-providers'; +export { BtcMainnetAddressBasedDetector } from './mainnet-address-based.js'; +export { BtcTestnetAddressBasedDetector } from './testnet-address-based.js'; +export { DefaultBitcoinDetectionProvider } from './default-bitcoin-detection-provider.js'; +import * as Providers from './default-providers.js'; export { Providers }; diff --git a/packages/payment-detection/src/btc/mainnet-address-based.ts b/packages/payment-detection/src/btc/mainnet-address-based.ts index d8b0311ab0..61cc02c992 100644 --- a/packages/payment-detection/src/btc/mainnet-address-based.ts +++ b/packages/payment-detection/src/btc/mainnet-address-based.ts @@ -1,6 +1,6 @@ import { AdvancedLogicTypes, PaymentTypes, ExtensionTypes } from '@requestnetwork/types'; -import { BtcAddressBasedDetector } from './address-based'; +import { BtcAddressBasedDetector } from './address-based.js'; const MAINNET_BITCOIN_NETWORK_ID = 0; diff --git a/packages/payment-detection/src/btc/testnet-address-based.ts b/packages/payment-detection/src/btc/testnet-address-based.ts index a69e9b00e5..43f7b115d6 100644 --- a/packages/payment-detection/src/btc/testnet-address-based.ts +++ b/packages/payment-detection/src/btc/testnet-address-based.ts @@ -1,6 +1,6 @@ import { AdvancedLogicTypes, PaymentTypes, ExtensionTypes } from '@requestnetwork/types'; -import { BtcAddressBasedDetector } from './address-based'; +import { BtcAddressBasedDetector } from './address-based.js'; const TESTNET_BITCOIN_NETWORK_ID = 3; diff --git a/packages/payment-detection/src/declarative.ts b/packages/payment-detection/src/declarative.ts index c138c985d0..9897b4ae98 100644 --- a/packages/payment-detection/src/declarative.ts +++ b/packages/payment-detection/src/declarative.ts @@ -4,7 +4,7 @@ import { PaymentTypes, RequestLogicTypes, } from '@requestnetwork/types'; -import { PaymentDetectorBase } from './payment-detector-base'; +import { PaymentDetectorBase } from './payment-detector-base.js'; import { notNull } from '@requestnetwork/utils'; /** diff --git a/packages/payment-detection/src/erc20/address-based-info-retriever.ts b/packages/payment-detection/src/erc20/address-based-info-retriever.ts index d8dec80d4a..17598c1f54 100644 --- a/packages/payment-detection/src/erc20/address-based-info-retriever.ts +++ b/packages/payment-detection/src/erc20/address-based-info-retriever.ts @@ -1,5 +1,5 @@ import { PaymentTypes } from '@requestnetwork/types'; -import { IPaymentRetriever } from '../types'; +import { IPaymentRetriever } from '../types.js'; import { ethers } from 'ethers'; import { getDefaultProvider } from '@requestnetwork/utils'; diff --git a/packages/payment-detection/src/erc20/address-based.ts b/packages/payment-detection/src/erc20/address-based.ts index 2562565d86..b74e074cfe 100644 --- a/packages/payment-detection/src/erc20/address-based.ts +++ b/packages/payment-detection/src/erc20/address-based.ts @@ -4,9 +4,9 @@ import { PaymentTypes, RequestLogicTypes, } from '@requestnetwork/types'; -import Erc20InfoRetriever from './address-based-info-retriever'; +import Erc20InfoRetriever from './address-based-info-retriever.js'; -import { PaymentDetectorBase } from '../payment-detector-base'; +import { PaymentDetectorBase } from '../payment-detector-base.js'; /** * Handle payment networks with ERC20 based address extension diff --git a/packages/payment-detection/src/erc20/escrow-info-retriever.ts b/packages/payment-detection/src/erc20/escrow-info-retriever.ts index 2f128d97e8..523a1a5330 100644 --- a/packages/payment-detection/src/erc20/escrow-info-retriever.ts +++ b/packages/payment-detection/src/erc20/escrow-info-retriever.ts @@ -1,8 +1,8 @@ import { PaymentTypes } from '@requestnetwork/types'; import { erc20EscrowToPayArtifact } from '@requestnetwork/smart-contracts'; import { BigNumber, ethers } from 'ethers'; -import { IEventRetriever } from '../types'; -import { makeGetDeploymentInformation, parseLogArgs } from '../utils'; +import { IEventRetriever } from '../types.js'; +import { makeGetDeploymentInformation, parseLogArgs } from '../utils.js'; import { getDefaultProvider } from '@requestnetwork/utils'; const ESCROW_CONTRACT_ADDRESS_MAP = { diff --git a/packages/payment-detection/src/erc20/fee-proxy-contract.ts b/packages/payment-detection/src/erc20/fee-proxy-contract.ts index 6eea1531c4..fc8ccc6c37 100644 --- a/packages/payment-detection/src/erc20/fee-proxy-contract.ts +++ b/packages/payment-detection/src/erc20/fee-proxy-contract.ts @@ -12,15 +12,15 @@ import { NearChains, isSameChain, } from '@requestnetwork/currency'; -import ProxyInfoRetriever from './proxy-info-retriever'; +import ProxyInfoRetriever from './proxy-info-retriever.js'; -import { loadCurrencyFromContract } from './currency'; -import { FeeReferenceBasedDetector } from '../fee-reference-based-detector'; -import { makeGetDeploymentInformation } from '../utils'; -import { TheGraphClient, TheGraphInfoRetriever } from '../thegraph'; -import { ReferenceBasedDetectorOptions, TGetSubGraphClient } from '../types'; -import { NearInfoRetriever } from '../near'; -import { NetworkNotSupported } from '../balance-error'; +import { loadCurrencyFromContract } from './currency.js'; +import { FeeReferenceBasedDetector } from '../fee-reference-based-detector.js'; +import { makeGetDeploymentInformation } from '../utils.js'; +import { TheGraphClient, TheGraphInfoRetriever } from '../thegraph.js'; +import { ReferenceBasedDetectorOptions, TGetSubGraphClient } from '../types.js'; +import { NearInfoRetriever } from '../near.js'; +import { NetworkNotSupported } from '../balance-error.js'; const PROXY_CONTRACT_ADDRESS_MAP = { ['0.1.0']: '0.1.0', diff --git a/packages/payment-detection/src/erc20/index.ts b/packages/payment-detection/src/erc20/index.ts index 113a1c0a25..df7ae52e92 100644 --- a/packages/payment-detection/src/erc20/index.ts +++ b/packages/payment-detection/src/erc20/index.ts @@ -1,4 +1,4 @@ -export { ERC20AddressBasedPaymentDetector } from './address-based'; -export { ERC20FeeProxyPaymentDetector } from './fee-proxy-contract'; -export { ERC20ProxyPaymentDetector } from './proxy-contract'; -export { ERC20TransferableReceivablePaymentDetector } from './transferable-receivable'; +export { ERC20AddressBasedPaymentDetector } from './address-based.js'; +export { ERC20FeeProxyPaymentDetector } from './fee-proxy-contract.js'; +export { ERC20ProxyPaymentDetector } from './proxy-contract.js'; +export { ERC20TransferableReceivablePaymentDetector } from './transferable-receivable.js'; diff --git a/packages/payment-detection/src/erc20/proxy-contract.ts b/packages/payment-detection/src/erc20/proxy-contract.ts index ed7205509c..57154361eb 100644 --- a/packages/payment-detection/src/erc20/proxy-contract.ts +++ b/packages/payment-detection/src/erc20/proxy-contract.ts @@ -5,11 +5,15 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; import { erc20ProxyArtifact } from '@requestnetwork/smart-contracts'; -import ProxyInfoRetriever from './proxy-info-retriever'; -import { TheGraphInfoRetriever } from '../thegraph'; -import { makeGetDeploymentInformation } from '../utils'; -import { ReferenceBasedDetector } from '../reference-based-detector'; -import { PaymentNetworkOptions, ReferenceBasedDetectorOptions, TGetSubGraphClient } from '../types'; +import ProxyInfoRetriever from './proxy-info-retriever.js'; +import { TheGraphInfoRetriever } from '../thegraph.js'; +import { makeGetDeploymentInformation } from '../utils.js'; +import { ReferenceBasedDetector } from '../reference-based-detector.js'; +import { + PaymentNetworkOptions, + ReferenceBasedDetectorOptions, + TGetSubGraphClient, +} from '../types.js'; const PROXY_CONTRACT_ADDRESS_MAP = { ['0.1.0']: '0.1.0', diff --git a/packages/payment-detection/src/erc20/proxy-info-retriever.ts b/packages/payment-detection/src/erc20/proxy-info-retriever.ts index 8dcbf7466c..24d7725d4c 100644 --- a/packages/payment-detection/src/erc20/proxy-info-retriever.ts +++ b/packages/payment-detection/src/erc20/proxy-info-retriever.ts @@ -1,7 +1,7 @@ import { PaymentTypes } from '@requestnetwork/types'; -import { IPaymentRetriever } from '../types'; +import { IPaymentRetriever } from '../types.js'; import { BigNumber, ethers } from 'ethers'; -import { parseLogArgs } from '../utils'; +import { parseLogArgs } from '../utils.js'; import { getDefaultProvider } from '@requestnetwork/utils'; // The ERC20 proxy smart contract ABI fragment containing TransferWithReference event diff --git a/packages/payment-detection/src/erc20/transferable-receivable.ts b/packages/payment-detection/src/erc20/transferable-receivable.ts index 7ee8243752..0ea681faa4 100644 --- a/packages/payment-detection/src/erc20/transferable-receivable.ts +++ b/packages/payment-detection/src/erc20/transferable-receivable.ts @@ -5,12 +5,16 @@ import { CurrencyTypes, } from '@requestnetwork/types'; -import { TheGraphInfoRetriever } from '../thegraph'; +import { TheGraphInfoRetriever } from '../thegraph.js'; import { erc20TransferableReceivableArtifact } from '@requestnetwork/smart-contracts'; -import { makeGetDeploymentInformation } from '../utils'; -import { PaymentNetworkOptions, ReferenceBasedDetectorOptions, TGetSubGraphClient } from '../types'; -import { FeeReferenceBasedDetector } from '../fee-reference-based-detector'; -import ProxyERC20InfoRetriever from './proxy-info-retriever'; +import { makeGetDeploymentInformation } from '../utils.js'; +import { + PaymentNetworkOptions, + ReferenceBasedDetectorOptions, + TGetSubGraphClient, +} from '../types.js'; +import { FeeReferenceBasedDetector } from '../fee-reference-based-detector.js'; +import ProxyERC20InfoRetriever from './proxy-info-retriever.js'; const ERC20_TRANSFERABLE_RECEIVABLE_CONTRACT_ADDRESS_MAP = { ['0.1.0']: '0.1.0', diff --git a/packages/payment-detection/src/erc777/superfluid-detector.ts b/packages/payment-detection/src/erc777/superfluid-detector.ts index 24e47edbc5..dc92a5c244 100644 --- a/packages/payment-detection/src/erc777/superfluid-detector.ts +++ b/packages/payment-detection/src/erc777/superfluid-detector.ts @@ -4,11 +4,11 @@ import { PaymentTypes, RequestLogicTypes, } from '@requestnetwork/types'; -import { SuperFluidInfoRetriever } from './superfluid-retriever'; -import { ReferenceBasedDetector } from '../reference-based-detector'; -import PaymentReferenceCalculator from '../payment-reference-calculator'; +import { SuperFluidInfoRetriever } from './superfluid-retriever.js'; +import { ReferenceBasedDetector } from '../reference-based-detector.js'; +import PaymentReferenceCalculator from '../payment-reference-calculator.js'; import { BigNumber } from 'ethers'; -import { ReferenceBasedDetectorOptions } from '../types'; +import { ReferenceBasedDetectorOptions } from '../types.js'; /** * Handle payment networks with ERC777 Superfluid streaming extension */ diff --git a/packages/payment-detection/src/erc777/superfluid-retriever.ts b/packages/payment-detection/src/erc777/superfluid-retriever.ts index 314491cfda..417f158338 100644 --- a/packages/payment-detection/src/erc777/superfluid-retriever.ts +++ b/packages/payment-detection/src/erc777/superfluid-retriever.ts @@ -1,10 +1,10 @@ import { PaymentTypes } from '@requestnetwork/types'; -import { FlowUpdatedEvent, SentEvent } from '../thegraph/generated/graphql-superfluid'; +import { FlowUpdatedEvent, SentEvent } from '../thegraph/generated/graphql-superfluid.js'; import { getTheGraphSuperfluidClient, TheGraphSuperfluidClient, TheGraphClientOptions, -} from '../thegraph/superfluid'; +} from '../thegraph/superfluid.js'; import { getCurrentTimestampInSecond } from '@requestnetwork/utils'; import { BigNumber } from 'ethers'; diff --git a/packages/payment-detection/src/eth/fee-proxy-detector.ts b/packages/payment-detection/src/eth/fee-proxy-detector.ts index 2f27e1b43f..ed4a2f323e 100644 --- a/packages/payment-detection/src/eth/fee-proxy-detector.ts +++ b/packages/payment-detection/src/eth/fee-proxy-detector.ts @@ -6,11 +6,15 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; -import { EthProxyInfoRetriever } from './proxy-info-retriever'; -import { FeeReferenceBasedDetector } from '../fee-reference-based-detector'; -import { makeGetDeploymentInformation } from '../utils'; -import { TheGraphInfoRetriever } from '../thegraph'; -import { PaymentNetworkOptions, ReferenceBasedDetectorOptions, TGetSubGraphClient } from '../types'; +import { EthProxyInfoRetriever } from './proxy-info-retriever.js'; +import { FeeReferenceBasedDetector } from '../fee-reference-based-detector.js'; +import { makeGetDeploymentInformation } from '../utils.js'; +import { TheGraphInfoRetriever } from '../thegraph.js'; +import { + PaymentNetworkOptions, + ReferenceBasedDetectorOptions, + TGetSubGraphClient, +} from '../types.js'; // interface of the object indexing the proxy contract version interface IProxyContractVersion { diff --git a/packages/payment-detection/src/eth/index.ts b/packages/payment-detection/src/eth/index.ts index b6f515dd43..38c1752e90 100644 --- a/packages/payment-detection/src/eth/index.ts +++ b/packages/payment-detection/src/eth/index.ts @@ -1,2 +1,2 @@ -export { EthInputDataPaymentDetector } from './input-data'; -export { EthFeeProxyPaymentDetector } from './fee-proxy-detector'; +export { EthInputDataPaymentDetector } from './input-data.js'; +export { EthFeeProxyPaymentDetector } from './fee-proxy-detector.js'; diff --git a/packages/payment-detection/src/eth/info-retriever.ts b/packages/payment-detection/src/eth/info-retriever.ts index 689ab80802..cfa7b884be 100644 --- a/packages/payment-detection/src/eth/info-retriever.ts +++ b/packages/payment-detection/src/eth/info-retriever.ts @@ -1,6 +1,6 @@ import { PaymentTypes } from '@requestnetwork/types'; -import { IPaymentRetriever } from '../types'; -import { MultichainExplorerApiProvider } from './multichainExplorerApiProvider'; +import { IPaymentRetriever } from '../types.js'; +import { MultichainExplorerApiProvider } from './multichainExplorerApiProvider.js'; /** * Gets a list of transfer events for an address and payment reference diff --git a/packages/payment-detection/src/eth/input-data.ts b/packages/payment-detection/src/eth/input-data.ts index 75e822d755..7da446f6a7 100644 --- a/packages/payment-detection/src/eth/input-data.ts +++ b/packages/payment-detection/src/eth/input-data.ts @@ -5,12 +5,16 @@ import { PaymentTypes, RequestLogicTypes, } from '@requestnetwork/types'; -import { EthInputDataInfoRetriever } from './info-retriever'; -import { EthProxyInfoRetriever } from './proxy-info-retriever'; -import { ReferenceBasedDetector } from '../reference-based-detector'; -import { makeGetDeploymentInformation } from '../utils'; -import { TheGraphInfoRetriever } from '../thegraph'; -import { PaymentNetworkOptions, ReferenceBasedDetectorOptions, TGetSubGraphClient } from '../types'; +import { EthInputDataInfoRetriever } from './info-retriever.js'; +import { EthProxyInfoRetriever } from './proxy-info-retriever.js'; +import { ReferenceBasedDetector } from '../reference-based-detector.js'; +import { makeGetDeploymentInformation } from '../utils.js'; +import { TheGraphInfoRetriever } from '../thegraph.js'; +import { + PaymentNetworkOptions, + ReferenceBasedDetectorOptions, + TGetSubGraphClient, +} from '../types.js'; // interface of the object indexing the proxy contract version interface IProxyContractVersion { diff --git a/packages/payment-detection/src/eth/proxy-info-retriever.ts b/packages/payment-detection/src/eth/proxy-info-retriever.ts index 789cefdd23..71e1548398 100644 --- a/packages/payment-detection/src/eth/proxy-info-retriever.ts +++ b/packages/payment-detection/src/eth/proxy-info-retriever.ts @@ -1,7 +1,7 @@ import { PaymentTypes } from '@requestnetwork/types'; -import { IPaymentRetriever } from '../types'; +import { IPaymentRetriever } from '../types.js'; import { BigNumber, ethers } from 'ethers'; -import { parseLogArgs } from '../utils'; +import { parseLogArgs } from '../utils.js'; import { getDefaultProvider } from '@requestnetwork/utils'; // The Ethereum proxy smart contract ABI fragment containing TransferWithReference event diff --git a/packages/payment-detection/src/fee-reference-based-detector.ts b/packages/payment-detection/src/fee-reference-based-detector.ts index 1922c65633..db90ba8099 100644 --- a/packages/payment-detection/src/fee-reference-based-detector.ts +++ b/packages/payment-detection/src/fee-reference-based-detector.ts @@ -1,7 +1,7 @@ import { BigNumber } from 'ethers'; import { ExtensionTypes, PaymentTypes, RequestLogicTypes } from '@requestnetwork/types'; import { ICurrencyManager } from '@requestnetwork/currency'; -import { ReferenceBasedDetector } from './reference-based-detector'; +import { ReferenceBasedDetector } from './reference-based-detector.js'; import { generate8randomBytes } from '@requestnetwork/utils'; /** diff --git a/packages/payment-detection/src/index.ts b/packages/payment-detection/src/index.ts index aea300fff9..abe2cc54d5 100644 --- a/packages/payment-detection/src/index.ts +++ b/packages/payment-detection/src/index.ts @@ -3,14 +3,14 @@ import { initPaymentDetectionApiKeys, setProviderFactory, } from '@requestnetwork/utils'; -import { PaymentNetworkFactory } from './payment-network-factory'; -import PaymentReferenceCalculator from './payment-reference-calculator'; -import * as BtcPaymentNetwork from './btc'; -import { DeclarativePaymentDetector } from './declarative'; -import * as Erc20PaymentNetwork from './erc20'; -import { AnyToERC20PaymentDetector, AnyToEthFeeProxyPaymentDetector } from './any'; -import { EthFeeProxyPaymentDetector, EthInputDataPaymentDetector } from './eth'; -import { getTheGraphClient, getTheGraphNearClient } from './thegraph'; +import { PaymentNetworkFactory } from './payment-network-factory.js'; +import PaymentReferenceCalculator from './payment-reference-calculator.js'; +import * as BtcPaymentNetwork from './btc.js'; +import { DeclarativePaymentDetector } from './declarative.js'; +import * as Erc20PaymentNetwork from './erc20/index.js'; +import { AnyToERC20PaymentDetector, AnyToEthFeeProxyPaymentDetector } from './any.js'; +import { EthFeeProxyPaymentDetector, EthInputDataPaymentDetector } from './eth.js'; +import { getTheGraphClient, getTheGraphNearClient } from './thegraph.js'; import { calculateEscrowState, formatAddress, @@ -20,16 +20,19 @@ import { padAmountForChainlink, parseLogArgs, unpadAmountFromChainlink, -} from './utils'; -import { NearConversionNativeTokenPaymentDetector, NearNativeTokenPaymentDetector } from './near'; -import { FeeReferenceBasedDetector } from './fee-reference-based-detector'; -import { SuperFluidPaymentDetector } from './erc777/superfluid-detector'; -import { EscrowERC20InfoRetriever } from './erc20/escrow-info-retriever'; -import { SuperFluidInfoRetriever } from './erc777/superfluid-retriever'; -import { PaymentNetworkOptions } from './types'; -import { ERC20TransferableReceivablePaymentDetector } from './erc20'; +} from './utils.js'; +import { + NearConversionNativeTokenPaymentDetector, + NearNativeTokenPaymentDetector, +} from './near.js'; +import { FeeReferenceBasedDetector } from './fee-reference-based-detector.js'; +import { SuperFluidPaymentDetector } from './erc777/superfluid-detector.js'; +import { EscrowERC20InfoRetriever } from './erc20/escrow-info-retriever.js'; +import { SuperFluidInfoRetriever } from './erc777/superfluid-retriever.js'; +import { PaymentNetworkOptions } from './types.js'; +import { ERC20TransferableReceivablePaymentDetector } from './erc20/index.js'; -export type { TheGraphClient } from './thegraph'; +export type { TheGraphClient } from './thegraph.js'; export { PaymentNetworkFactory, diff --git a/packages/payment-detection/src/native-token-detector.ts b/packages/payment-detection/src/native-token-detector.ts index 943d769160..7a1f5c057e 100644 --- a/packages/payment-detection/src/native-token-detector.ts +++ b/packages/payment-detection/src/native-token-detector.ts @@ -1,7 +1,7 @@ import { CurrencyTypes, ExtensionTypes, PaymentTypes } from '@requestnetwork/types'; -import { ReferenceBasedDetector } from './reference-based-detector'; -import { NativeDetectorOptions } from './types'; +import { ReferenceBasedDetector } from './reference-based-detector.js'; +import { NativeDetectorOptions } from './types.js'; /** * Handle payment detection for native token payment diff --git a/packages/payment-detection/src/near/index.ts b/packages/payment-detection/src/near/index.ts index 408868b950..e78f3da6d7 100644 --- a/packages/payment-detection/src/near/index.ts +++ b/packages/payment-detection/src/near/index.ts @@ -1,4 +1,4 @@ -export { NearNativeTokenPaymentDetector } from './near-detector'; -export { NearConversionNativeTokenPaymentDetector } from './near-conversion-detector'; -export { NearConversionInfoRetriever } from './retrievers/near-conversion-info-retriever'; -export { NearInfoRetriever } from './retrievers/near-info-retriever'; +export { NearNativeTokenPaymentDetector } from './near-detector.js'; +export { NearConversionNativeTokenPaymentDetector } from './near-conversion-detector.js'; +export { NearConversionInfoRetriever } from './retrievers/near-conversion-info-retriever.js'; +export { NearInfoRetriever } from './retrievers/near-info-retriever.js'; diff --git a/packages/payment-detection/src/near/near-conversion-detector.ts b/packages/payment-detection/src/near/near-conversion-detector.ts index fadac7f48f..17ac1bb5bf 100644 --- a/packages/payment-detection/src/near/near-conversion-detector.ts +++ b/packages/payment-detection/src/near/near-conversion-detector.ts @@ -5,10 +5,10 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; import { NearChains, UnsupportedCurrencyError } from '@requestnetwork/currency'; -import { NearConversionInfoRetriever } from './retrievers/near-conversion-info-retriever'; -import { AnyToNativeDetector } from '../any-to-native-detector'; -import { NetworkNotSupported } from '../balance-error'; -import { NativeDetectorOptions } from '../types'; +import { NearConversionInfoRetriever } from './retrievers/near-conversion-info-retriever.js'; +import { AnyToNativeDetector } from '../any-to-native-detector.js'; +import { NetworkNotSupported } from '../balance-error.js'; +import { NativeDetectorOptions } from '../types.js'; // interface of the object indexing the proxy contract version interface IProxyContractVersion { diff --git a/packages/payment-detection/src/near/near-detector.ts b/packages/payment-detection/src/near/near-detector.ts index 97311a46fd..738bbb3ac2 100644 --- a/packages/payment-detection/src/near/near-detector.ts +++ b/packages/payment-detection/src/near/near-detector.ts @@ -4,10 +4,10 @@ import { PaymentTypes, RequestLogicTypes, } from '@requestnetwork/types'; -import { NearInfoRetriever } from './retrievers/near-info-retriever'; -import { NativeTokenPaymentDetector } from '../native-token-detector'; -import { NetworkNotSupported } from '../balance-error'; -import { NativeDetectorOptions } from '../types'; +import { NearInfoRetriever } from './retrievers/near-info-retriever.js'; +import { NativeTokenPaymentDetector } from '../native-token-detector.js'; +import { NetworkNotSupported } from '../balance-error.js'; +import { NativeDetectorOptions } from '../types.js'; // interface of the object indexing the proxy contract version interface IProxyContractVersion { diff --git a/packages/payment-detection/src/near/retrievers/near-conversion-info-retriever.ts b/packages/payment-detection/src/near/retrievers/near-conversion-info-retriever.ts index 3e4280bf0c..b90aad3116 100644 --- a/packages/payment-detection/src/near/retrievers/near-conversion-info-retriever.ts +++ b/packages/payment-detection/src/near/retrievers/near-conversion-info-retriever.ts @@ -1,7 +1,7 @@ import { CurrencyTypes, PaymentTypes } from '@requestnetwork/types'; import { CurrencyDefinition } from '@requestnetwork/currency'; -import { NearInfoRetriever, NearPaymentEvent } from './near-info-retriever'; -import { TheGraphClient } from '../../thegraph'; +import { NearInfoRetriever, NearPaymentEvent } from './near-info-retriever.js'; +import { TheGraphClient } from '../../thegraph.js'; export type TransferEventsParams = { /** The reference to identify the payment*/ diff --git a/packages/payment-detection/src/near/retrievers/near-info-retriever.ts b/packages/payment-detection/src/near/retrievers/near-info-retriever.ts index 855bdc87f0..1a7647fcb8 100644 --- a/packages/payment-detection/src/near/retrievers/near-info-retriever.ts +++ b/packages/payment-detection/src/near/retrievers/near-info-retriever.ts @@ -1,5 +1,5 @@ import { CurrencyTypes, PaymentTypes } from '@requestnetwork/types'; -import { TheGraphClient } from '../../thegraph'; +import { TheGraphClient } from '../../thegraph.js'; import { GetNearPaymentsQuery } from 'payment-detection/src/thegraph/generated/graphql-near'; import { ITheGraphBaseInfoRetriever } from 'payment-detection/src/types'; diff --git a/packages/payment-detection/src/payment-detector-base.ts b/packages/payment-detection/src/payment-detector-base.ts index 8ecfdb58fc..7ed6ea1dfd 100644 --- a/packages/payment-detection/src/payment-detector-base.ts +++ b/packages/payment-detection/src/payment-detector-base.ts @@ -4,7 +4,7 @@ import { BalanceError, ExtensionMissingRequiredValue, getBalanceErrorObject, -} from './balance-error'; +} from './balance-error.js'; export abstract class PaymentDetectorBase< TExtension extends ExtensionTypes.IExtension, diff --git a/packages/payment-detection/src/payment-network-factory.ts b/packages/payment-detection/src/payment-network-factory.ts index f2f702de75..0447d94763 100644 --- a/packages/payment-detection/src/payment-network-factory.ts +++ b/packages/payment-detection/src/payment-network-factory.ts @@ -11,21 +11,24 @@ import { IPaymentNetworkModuleByType, ISupportedPaymentNetworkByCurrency, PaymentNetworkOptions, -} from './types'; -import { BtcMainnetAddressBasedDetector, BtcTestnetAddressBasedDetector } from './btc'; -import { DeclarativePaymentDetector } from './declarative'; +} from './types.js'; +import { BtcMainnetAddressBasedDetector, BtcTestnetAddressBasedDetector } from './btc.js'; +import { DeclarativePaymentDetector } from './declarative.js'; import { ERC20AddressBasedPaymentDetector, ERC20FeeProxyPaymentDetector, ERC20ProxyPaymentDetector, ERC20TransferableReceivablePaymentDetector, -} from './erc20'; -import { SuperFluidPaymentDetector } from './erc777/superfluid-detector'; -import { EthFeeProxyPaymentDetector, EthInputDataPaymentDetector } from './eth'; -import { AnyToERC20PaymentDetector, AnyToEthFeeProxyPaymentDetector } from './any'; -import { NearConversionNativeTokenPaymentDetector, NearNativeTokenPaymentDetector } from './near'; -import { getPaymentNetworkExtension } from './utils'; -import { defaultGetTheGraphClient } from './thegraph'; +} from './erc20.js'; +import { SuperFluidPaymentDetector } from './erc777/superfluid-detector.js'; +import { EthFeeProxyPaymentDetector, EthInputDataPaymentDetector } from './eth.js'; +import { AnyToERC20PaymentDetector, AnyToEthFeeProxyPaymentDetector } from './any.js'; +import { + NearConversionNativeTokenPaymentDetector, + NearNativeTokenPaymentDetector, +} from './near.js'; +import { getPaymentNetworkExtension } from './utils.js'; +import { defaultGetTheGraphClient } from './thegraph.js'; import { getDefaultProvider } from 'ethers'; const PN_ID = ExtensionTypes.PAYMENT_NETWORK_ID; diff --git a/packages/payment-detection/src/reference-based-detector.ts b/packages/payment-detection/src/reference-based-detector.ts index 0c0cca54c1..696af9db7f 100644 --- a/packages/payment-detection/src/reference-based-detector.ts +++ b/packages/payment-detection/src/reference-based-detector.ts @@ -6,9 +6,9 @@ import { TypesUtils, } from '@requestnetwork/types'; import { ICurrencyManager } from '@requestnetwork/currency'; -import PaymentReferenceCalculator from './payment-reference-calculator'; +import PaymentReferenceCalculator from './payment-reference-calculator.js'; -import { DeclarativePaymentDetectorBase } from './declarative'; +import { DeclarativePaymentDetectorBase } from './declarative.js'; import { generate8randomBytes } from '@requestnetwork/utils'; /** diff --git a/packages/payment-detection/src/thegraph/__mocks__/client.ts b/packages/payment-detection/src/thegraph/__mocks__/client.ts index 5407d71fd4..7e6d101d09 100644 --- a/packages/payment-detection/src/thegraph/__mocks__/client.ts +++ b/packages/payment-detection/src/thegraph/__mocks__/client.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -import type { TheGraphClient } from '../client'; +import type { TheGraphClient } from '../client.js'; export const theGraphClient: TheGraphClient = { GetLastSyncedBlock: jest.fn(), GetPaymentsAndEscrowState: jest.fn(), diff --git a/packages/payment-detection/src/thegraph/client.ts b/packages/payment-detection/src/thegraph/client.ts index 557ca9b423..66226615db 100644 --- a/packages/payment-detection/src/thegraph/client.ts +++ b/packages/payment-detection/src/thegraph/client.ts @@ -2,8 +2,8 @@ import { CurrencyTypes } from '@requestnetwork/types'; import { NearChains } from '@requestnetwork/currency'; import { GraphQLClient } from 'graphql-request'; -import { getSdk } from './generated/graphql'; -import { getSdk as getNearSdk } from './generated/graphql-near'; +import { getSdk } from './generated/graphql.js'; +import { getSdk as getNearSdk } from './generated/graphql-near.js'; const HOSTED_THE_GRAPH_URL = 'https://api.thegraph.com/subgraphs/name/requestnetwork/request-payments-'; diff --git a/packages/payment-detection/src/thegraph/conversion-info-retriever.ts b/packages/payment-detection/src/thegraph/conversion-info-retriever.ts index 2818cdeb3b..f4f9e16503 100644 --- a/packages/payment-detection/src/thegraph/conversion-info-retriever.ts +++ b/packages/payment-detection/src/thegraph/conversion-info-retriever.ts @@ -1,10 +1,10 @@ import { PaymentTypes } from '@requestnetwork/types'; import { ICurrencyManager } from '@requestnetwork/currency'; import { utils } from 'ethers'; -import { TheGraphClient } from './client'; -import { TheGraphInfoRetriever } from './info-retriever'; -import type { PaymentEventResultFragment } from './generated/graphql'; -import { ConversionTransferEventsParams } from '../types'; +import { TheGraphClient } from './client.js'; +import { TheGraphInfoRetriever } from './info-retriever.js'; +import type { PaymentEventResultFragment } from './generated/graphql.js'; +import { ConversionTransferEventsParams } from '../types.js'; /** * TheGraph info retriever for conversion payments on EVMs, with no escrow support diff --git a/packages/payment-detection/src/thegraph/index.ts b/packages/payment-detection/src/thegraph/index.ts index d92d2eb937..44d01bf1b2 100644 --- a/packages/payment-detection/src/thegraph/index.ts +++ b/packages/payment-detection/src/thegraph/index.ts @@ -1,2 +1,2 @@ -export * from './client'; -export * from './info-retriever'; +export * from './client.js'; +export * from './info-retriever.js'; diff --git a/packages/payment-detection/src/thegraph/info-retriever.ts b/packages/payment-detection/src/thegraph/info-retriever.ts index abc24228b8..cf087e8b8b 100644 --- a/packages/payment-detection/src/thegraph/info-retriever.ts +++ b/packages/payment-detection/src/thegraph/info-retriever.ts @@ -3,9 +3,9 @@ import { ICurrencyManager } from '@requestnetwork/currency'; import { utils } from 'ethers'; import { pick, mapValues } from 'lodash'; import type { TheGraphClient } from '.'; -import type { EscrowEventResultFragment, PaymentEventResultFragment } from './generated/graphql'; -import { formatAddress, unpadAmountFromChainlink } from '../utils'; -import { TransferEventsParams, ITheGraphBaseInfoRetriever } from '../types'; +import type { EscrowEventResultFragment, PaymentEventResultFragment } from './generated/graphql.js'; +import { formatAddress, unpadAmountFromChainlink } from '../utils.js'; +import { TransferEventsParams, ITheGraphBaseInfoRetriever } from '../types.js'; /** * TheGraph info retriever for payments without conversion on EVMs diff --git a/packages/payment-detection/src/thegraph/superfluid.ts b/packages/payment-detection/src/thegraph/superfluid.ts index 6f8aaddcb2..760961b89f 100644 --- a/packages/payment-detection/src/thegraph/superfluid.ts +++ b/packages/payment-detection/src/thegraph/superfluid.ts @@ -1,5 +1,5 @@ import { GraphQLClient } from 'graphql-request'; -import { getSdk } from './generated/graphql-superfluid'; +import { getSdk } from './generated/graphql-superfluid.js'; const BASE_URL = `https://api.thegraph.com`; const NETWORK_TO_URL: Record = { diff --git a/packages/payment-detection/src/types.ts b/packages/payment-detection/src/types.ts index 3aa34d3f01..1cb531c8cc 100644 --- a/packages/payment-detection/src/types.ts +++ b/packages/payment-detection/src/types.ts @@ -4,11 +4,11 @@ import { ExtensionTypes, PaymentTypes, } from '@requestnetwork/types'; -import { PaymentDetectorBase } from './payment-detector-base'; -import { GetDeploymentInformation } from './utils'; +import { PaymentDetectorBase } from './payment-detector-base.js'; +import { GetDeploymentInformation } from './utils.js'; import type { CurrencyDefinition, ICurrencyManager } from '@requestnetwork/currency'; import type { providers } from 'ethers'; -import type { TheGraphClient } from './thegraph'; +import type { TheGraphClient } from './thegraph.js'; export interface ContractBasedDetector { getDeploymentInformation: GetDeploymentInformation; diff --git a/packages/payment-detection/src/utils.ts b/packages/payment-detection/src/utils.ts index b1e444e228..7c706053a5 100644 --- a/packages/payment-detection/src/utils.ts +++ b/packages/payment-detection/src/utils.ts @@ -8,8 +8,8 @@ import { import { BigNumber, BigNumberish, Contract, errors, logger } from 'ethers'; 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'; +import { NetworkNotSupported, VersionNotSupported } from './balance-error.js'; +import PaymentReferenceCalculator from './payment-reference-calculator.js'; /** * Converts the Log's args from array to an object with keys being the name of the arguments diff --git a/packages/payment-detection/test/any/any-to-erc20-proxy-contract.test.ts b/packages/payment-detection/test/any/any-to-erc20-proxy-contract.test.ts index 1a4c7977df..a1b132ea9b 100644 --- a/packages/payment-detection/test/any/any-to-erc20-proxy-contract.test.ts +++ b/packages/payment-detection/test/any/any-to-erc20-proxy-contract.test.ts @@ -9,9 +9,9 @@ import { } from '@requestnetwork/types'; import { CurrencyManager } from '@requestnetwork/currency'; import { ERC20__factory } from '@requestnetwork/smart-contracts/types'; -import { AnyToERC20PaymentDetector, getTheGraphClient } from '../../src'; +import { AnyToERC20PaymentDetector, getTheGraphClient } from '../../src/index.js'; import { mocked } from 'ts-jest/utils'; -import { mockAdvancedLogicBase } from '../utils'; +import { mockAdvancedLogicBase } from '../utils.js'; jest.mock('../../src/thegraph/client'); const theGraphClientMock = mocked(getTheGraphClient('')); diff --git a/packages/payment-detection/test/any/any-to-erc20-proxy-info-retriever.test.ts b/packages/payment-detection/test/any/any-to-erc20-proxy-info-retriever.test.ts index 140b878a76..f52c989b93 100644 --- a/packages/payment-detection/test/any/any-to-erc20-proxy-info-retriever.test.ts +++ b/packages/payment-detection/test/any/any-to-erc20-proxy-info-retriever.test.ts @@ -2,7 +2,7 @@ /* eslint-disable no-magic-numbers */ import { PaymentTypes } from '@requestnetwork/types'; import { CurrencyManager } from '@requestnetwork/currency'; -import { AnyToErc20InfoRetriever } from '../../src/any/retrievers/any-to-erc20-proxy'; +import { AnyToErc20InfoRetriever } from '../../src/any/retrievers/any-to-erc20-proxy.js'; import { ethers } from 'ethers'; import { erc20ConversionProxy } from '@requestnetwork/smart-contracts'; diff --git a/packages/payment-detection/test/any/any-to-eth.test.ts b/packages/payment-detection/test/any/any-to-eth.test.ts index dc4ec1315a..d7bbb3dfec 100644 --- a/packages/payment-detection/test/any/any-to-eth.test.ts +++ b/packages/payment-detection/test/any/any-to-eth.test.ts @@ -2,8 +2,8 @@ import { AdvancedLogic } from '@requestnetwork/advanced-logic'; import { CurrencyManager } from '@requestnetwork/currency'; import { ExtensionTypes, IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; import { StaticJsonRpcProvider } from '@ethersproject/providers'; -import { AnyToEthFeeProxyPaymentDetector } from '../../src/any'; -import { getTheGraphClient } from '../../src/thegraph'; +import { AnyToEthFeeProxyPaymentDetector } from '../../src/any.js'; +import { getTheGraphClient } from '../../src/thegraph.js'; import { mocked } from 'ts-jest/utils'; const getLogs = jest.spyOn(StaticJsonRpcProvider.prototype, 'getLogs'); diff --git a/packages/payment-detection/test/btc/default-bitcoin-detection-provider.test.ts b/packages/payment-detection/test/btc/default-bitcoin-detection-provider.test.ts index 56ed59e8d5..58a3eee829 100644 --- a/packages/payment-detection/test/btc/default-bitcoin-detection-provider.test.ts +++ b/packages/payment-detection/test/btc/default-bitcoin-detection-provider.test.ts @@ -1,6 +1,6 @@ import { PaymentTypes } from '@requestnetwork/types'; -import { DefaultBitcoinDetectionProvider } from '../../src/btc/default-bitcoin-detection-provider'; +import { DefaultBitcoinDetectionProvider } from '../../src/btc/default-bitcoin-detection-provider.js'; const btcProviderMock0: PaymentTypes.IBitcoinDetectionProvider = { getAddressBalanceWithEvents: async (): Promise => ({ diff --git a/packages/payment-detection/test/btc/default-providers/blockchain-info.test.ts b/packages/payment-detection/test/btc/default-providers/blockchain-info.test.ts index 2ab543a321..46fba955ea 100644 --- a/packages/payment-detection/test/btc/default-providers/blockchain-info.test.ts +++ b/packages/payment-detection/test/btc/default-providers/blockchain-info.test.ts @@ -1,7 +1,7 @@ import { PaymentTypes } from '@requestnetwork/types'; -import { BlockchainInfoProvider } from '../../../src/btc/default-providers/blockchain-info'; +import { BlockchainInfoProvider } from '../../../src/btc/default-providers/blockchain-info.js'; -import * as BlockchainInfoData from './blockchain-info-data'; +import * as BlockchainInfoData from './blockchain-info-data.js'; // Most of the tests are done as integration tests in ../index.test.ts /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/payment-detection/test/btc/default-providers/blockcypher-com.test.ts b/packages/payment-detection/test/btc/default-providers/blockcypher-com.test.ts index a9e2efe397..18ef870560 100644 --- a/packages/payment-detection/test/btc/default-providers/blockcypher-com.test.ts +++ b/packages/payment-detection/test/btc/default-providers/blockcypher-com.test.ts @@ -1,7 +1,7 @@ import { PaymentTypes } from '@requestnetwork/types'; -import { BlockcypherComProvider } from '../../../src/btc/default-providers/blockcypher-com'; +import { BlockcypherComProvider } from '../../../src/btc/default-providers/blockcypher-com.js'; -import * as BlockCypherComData from './blockcypher-com-data'; +import * as BlockCypherComData from './blockcypher-com-data.js'; // Most of the tests are done as integration tests in ../index.test.ts /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/payment-detection/test/btc/default-providers/blockstream-info.test.ts b/packages/payment-detection/test/btc/default-providers/blockstream-info.test.ts index 06675be876..a80d5e5241 100644 --- a/packages/payment-detection/test/btc/default-providers/blockstream-info.test.ts +++ b/packages/payment-detection/test/btc/default-providers/blockstream-info.test.ts @@ -1,8 +1,8 @@ import { PaymentTypes } from '@requestnetwork/types'; -import { BlockStreamInfoProvider } from '../../../src/btc/default-providers/blockstream-info'; +import { BlockStreamInfoProvider } from '../../../src/btc/default-providers/blockstream-info.js'; -import * as BlockstreamData from './blockstream-info-data'; +import * as BlockstreamData from './blockstream-info-data.js'; // Most of the tests are done as integration tests in ../index.test.ts /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/payment-detection/test/btc/default-providers/chain-so.test.ts b/packages/payment-detection/test/btc/default-providers/chain-so.test.ts index ba8391ebab..490474bdb3 100644 --- a/packages/payment-detection/test/btc/default-providers/chain-so.test.ts +++ b/packages/payment-detection/test/btc/default-providers/chain-so.test.ts @@ -1,8 +1,8 @@ import { PaymentTypes } from '@requestnetwork/types'; -import { ChainSoProvider } from '../../../src/btc/default-providers/chain-so'; +import { ChainSoProvider } from '../../../src/btc/default-providers/chain-so.js'; -import * as ChainSoData from './chain-so-data'; +import * as ChainSoData from './chain-so-data.js'; // Most of the tests are done as integration tests in ../index.test.ts /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/payment-detection/test/btc/mainnet-address-based.test.ts b/packages/payment-detection/test/btc/mainnet-address-based.test.ts index 6bf74c32d2..5c865f1da6 100644 --- a/packages/payment-detection/test/btc/mainnet-address-based.test.ts +++ b/packages/payment-detection/test/btc/mainnet-address-based.test.ts @@ -1,7 +1,7 @@ import { AdvancedLogicTypes, PaymentTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { BtcMainnetAddressBasedDetector } from '../../src/btc/mainnet-address-based'; -import { mockAdvancedLogicBase } from '../utils'; +import { BtcMainnetAddressBasedDetector } from '../../src/btc/mainnet-address-based.js'; +import { mockAdvancedLogicBase } from '../utils.js'; let btcAddressedBased: BtcMainnetAddressBasedDetector; diff --git a/packages/payment-detection/test/btc/testnet-address-based.test.ts b/packages/payment-detection/test/btc/testnet-address-based.test.ts index 7df19781ca..4a32e1eabf 100644 --- a/packages/payment-detection/test/btc/testnet-address-based.test.ts +++ b/packages/payment-detection/test/btc/testnet-address-based.test.ts @@ -1,7 +1,7 @@ import { AdvancedLogicTypes, PaymentTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { BtcTestnetAddressBasedDetector } from '../../src/btc/testnet-address-based'; -import { mockAdvancedLogicBase } from '../utils'; +import { BtcTestnetAddressBasedDetector } from '../../src/btc/testnet-address-based.js'; +import { mockAdvancedLogicBase } from '../utils.js'; let btcAddressedBased: BtcTestnetAddressBasedDetector; diff --git a/packages/payment-detection/test/declarative.test.ts b/packages/payment-detection/test/declarative.test.ts index db3447ff31..ce8cac098f 100644 --- a/packages/payment-detection/test/declarative.test.ts +++ b/packages/payment-detection/test/declarative.test.ts @@ -6,8 +6,8 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; -import { DeclarativePaymentDetector } from '../src/declarative'; -import { mockAdvancedLogicBase } from './utils'; +import { DeclarativePaymentDetector } from '../src/declarative.js'; +import { mockAdvancedLogicBase } from './utils.js'; let declarative: DeclarativePaymentDetector; diff --git a/packages/payment-detection/test/erc20/address-based-info-retriever.test.ts b/packages/payment-detection/test/erc20/address-based-info-retriever.test.ts index 1c195e7682..85c6659f6c 100644 --- a/packages/payment-detection/test/erc20/address-based-info-retriever.test.ts +++ b/packages/payment-detection/test/erc20/address-based-info-retriever.test.ts @@ -1,7 +1,7 @@ /* eslint-disable no-invalid-this */ /* eslint-disable no-magic-numbers */ import { PaymentTypes } from '@requestnetwork/types'; -import ERC20InfoRetriever from '../../src/erc20/address-based-info-retriever'; +import ERC20InfoRetriever from '../../src/erc20/address-based-info-retriever.js'; const erc20LocalhostContractAddress = '0x9FBDa871d559710256a2502A2517b794B482Db40'; diff --git a/packages/payment-detection/test/erc20/address-based.test.ts b/packages/payment-detection/test/erc20/address-based.test.ts index 17e96378b9..157d874388 100644 --- a/packages/payment-detection/test/erc20/address-based.test.ts +++ b/packages/payment-detection/test/erc20/address-based.test.ts @@ -4,8 +4,8 @@ import { PaymentTypes, RequestLogicTypes, } from '@requestnetwork/types'; -import { ERC20AddressBasedPaymentDetector } from '../../src/erc20'; -import { mockAdvancedLogicBase } from '../utils'; +import { ERC20AddressBasedPaymentDetector } from '../../src/erc20.js'; +import { mockAdvancedLogicBase } from '../utils.js'; import { AdvancedLogic } from '@requestnetwork/advanced-logic'; import { CurrencyManager } from '@requestnetwork/currency'; diff --git a/packages/payment-detection/test/erc20/escrow-info-retriever.test.ts b/packages/payment-detection/test/erc20/escrow-info-retriever.test.ts index 5c66e2c703..c2bfd653a6 100644 --- a/packages/payment-detection/test/erc20/escrow-info-retriever.test.ts +++ b/packages/payment-detection/test/erc20/escrow-info-retriever.test.ts @@ -1,6 +1,6 @@ /* eslint-disable no-invalid-this */ /* eslint-disable no-magic-numbers */ -import { EscrowERC20InfoRetriever } from '../../src/erc20/escrow-info-retriever'; +import { EscrowERC20InfoRetriever } from '../../src/erc20/escrow-info-retriever.js'; import { ethers } from 'ethers'; import { PaymentTypes } from '@requestnetwork/types'; diff --git a/packages/payment-detection/test/erc20/escrow-proxy-contract.test.ts b/packages/payment-detection/test/erc20/escrow-proxy-contract.test.ts index 4d41ea5d6b..b9ea135595 100644 --- a/packages/payment-detection/test/erc20/escrow-proxy-contract.test.ts +++ b/packages/payment-detection/test/erc20/escrow-proxy-contract.test.ts @@ -6,8 +6,8 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; import { CurrencyManager } from '@requestnetwork/currency'; -import { Erc20PaymentNetwork } from '../../src'; -import { mockAdvancedLogicBase } from '../utils'; +import { Erc20PaymentNetwork } from '../../src/index.js'; +import { mockAdvancedLogicBase } from '../utils.js'; let erc20FeeProxyDetector: Erc20PaymentNetwork.ERC20FeeProxyPaymentDetector; diff --git a/packages/payment-detection/test/erc20/fee-proxy-contract.test.ts b/packages/payment-detection/test/erc20/fee-proxy-contract.test.ts index 255e3e635f..b60852271e 100644 --- a/packages/payment-detection/test/erc20/fee-proxy-contract.test.ts +++ b/packages/payment-detection/test/erc20/fee-proxy-contract.test.ts @@ -7,8 +7,8 @@ import { CurrencyTypes, } from '@requestnetwork/types'; import { CurrencyManager } from '@requestnetwork/currency'; -import { ERC20FeeProxyPaymentDetector } from '../../src/erc20/fee-proxy-contract'; -import { mockAdvancedLogicBase } from '../utils'; +import { ERC20FeeProxyPaymentDetector } from '../../src/erc20/fee-proxy-contract.js'; +import { mockAdvancedLogicBase } from '../utils.js'; let erc20FeeProxyContract: ERC20FeeProxyPaymentDetector; diff --git a/packages/payment-detection/test/erc20/proxy-contract.test.ts b/packages/payment-detection/test/erc20/proxy-contract.test.ts index 7b115c7d33..907d6dc8b5 100644 --- a/packages/payment-detection/test/erc20/proxy-contract.test.ts +++ b/packages/payment-detection/test/erc20/proxy-contract.test.ts @@ -6,9 +6,9 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; import { CurrencyManager } from '@requestnetwork/currency'; -import { ERC20ProxyPaymentDetector } from '../../src/erc20'; -import { getTheGraphClient } from '../../src'; -import { mockAdvancedLogicBase } from '../utils'; +import { ERC20ProxyPaymentDetector } from '../../src/erc20.js'; +import { getTheGraphClient } from '../../src/index.js'; +import { mockAdvancedLogicBase } from '../utils.js'; let erc20ProxyContract: ERC20ProxyPaymentDetector; diff --git a/packages/payment-detection/test/erc20/proxy-info-retriever.test.ts b/packages/payment-detection/test/erc20/proxy-info-retriever.test.ts index 22e4f37ff2..4519016326 100644 --- a/packages/payment-detection/test/erc20/proxy-info-retriever.test.ts +++ b/packages/payment-detection/test/erc20/proxy-info-retriever.test.ts @@ -1,7 +1,7 @@ /* eslint-disable no-invalid-this */ /* eslint-disable no-magic-numbers */ import { PaymentTypes } from '@requestnetwork/types'; -import ProxyERC20InfoRetriever from '../../src/erc20/proxy-info-retriever'; +import ProxyERC20InfoRetriever from '../../src/erc20/proxy-info-retriever.js'; import { ethers } from 'ethers'; const erc20LocalhostContractAddress = '0x9FBDa871d559710256a2502A2517b794B482Db40'; diff --git a/packages/payment-detection/test/erc20/thegraph-info-retriever.test.ts b/packages/payment-detection/test/erc20/thegraph-info-retriever.test.ts index 798bb84ed0..1f8df637aa 100644 --- a/packages/payment-detection/test/erc20/thegraph-info-retriever.test.ts +++ b/packages/payment-detection/test/erc20/thegraph-info-retriever.test.ts @@ -1,10 +1,10 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ -import { TheGraphClient, TheGraphInfoRetriever } from '../../src/thegraph'; -import PaymentReferenceCalculator from '../../src/payment-reference-calculator'; +import { TheGraphClient, TheGraphInfoRetriever } from '../../src/thegraph.js'; +import PaymentReferenceCalculator from '../../src/payment-reference-calculator.js'; import { utils } from 'ethers'; import { PaymentTypes } from '@requestnetwork/types'; import { CurrencyManager } from '@requestnetwork/currency'; -import { hashReference } from '../../src'; +import { hashReference } from '../../src/index.js'; const paymentsMockData = { ['0xc6e23a20c0a1933acc8e30247b5d1e2215796c1f' as string]: [ diff --git a/packages/payment-detection/test/erc20/transferable-receivable.test.ts b/packages/payment-detection/test/erc20/transferable-receivable.test.ts index 9678565211..30e8350e7f 100644 --- a/packages/payment-detection/test/erc20/transferable-receivable.test.ts +++ b/packages/payment-detection/test/erc20/transferable-receivable.test.ts @@ -1,7 +1,7 @@ import { CurrencyManager } from '@requestnetwork/currency'; -import { TheGraphClient, TheGraphInfoRetriever } from '../../src/thegraph'; -import PaymentReferenceCalculator from '../../src/payment-reference-calculator'; -import { ERC20TransferableReceivablePaymentDetector } from '../../src/erc20'; +import { TheGraphClient, TheGraphInfoRetriever } from '../../src/thegraph.js'; +import PaymentReferenceCalculator from '../../src/payment-reference-calculator.js'; +import { ERC20TransferableReceivablePaymentDetector } from '../../src/erc20.js'; import { AdvancedLogicTypes, CurrencyTypes, @@ -10,8 +10,8 @@ import { PaymentTypes, RequestLogicTypes, } from '@requestnetwork/types'; -import { mockAdvancedLogicBase } from '../utils'; -import ProxyERC20InfoRetriever from '../../src/erc20/proxy-info-retriever'; +import { mockAdvancedLogicBase } from '../utils.js'; +import ProxyERC20InfoRetriever from '../../src/erc20/proxy-info-retriever.js'; import { ethers, utils } from 'ethers'; let erc20TransferableReceivable: ERC20TransferableReceivablePaymentDetector; diff --git a/packages/payment-detection/test/erc777/superfluid-detector.test.ts b/packages/payment-detection/test/erc777/superfluid-detector.test.ts index 33238f026e..738e0ef90f 100644 --- a/packages/payment-detection/test/erc777/superfluid-detector.test.ts +++ b/packages/payment-detection/test/erc777/superfluid-detector.test.ts @@ -6,9 +6,9 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; import { CurrencyManager } from '@requestnetwork/currency'; -import { SuperFluidPaymentDetector } from '../../src/erc777/superfluid-detector'; -import { genTransferEventsByMonth } from './mocks'; -import { mockAdvancedLogicBase } from '../utils'; +import { SuperFluidPaymentDetector } from '../../src/erc777/superfluid-detector.js'; +import { genTransferEventsByMonth } from './mocks.js'; +import { mockAdvancedLogicBase } from '../utils.js'; let superfluidPaymentDetector: SuperFluidPaymentDetector; diff --git a/packages/payment-detection/test/erc777/superfluid-retriever.test.ts b/packages/payment-detection/test/erc777/superfluid-retriever.test.ts index 0ad55080ed..f9a82fba85 100644 --- a/packages/payment-detection/test/erc777/superfluid-retriever.test.ts +++ b/packages/payment-detection/test/erc777/superfluid-retriever.test.ts @@ -1,9 +1,9 @@ -import { SuperFluidInfoRetriever } from '../../src/erc777/superfluid-retriever'; -import PaymentReferenceCalculator from '../../src/payment-reference-calculator'; +import { SuperFluidInfoRetriever } from '../../src/erc777/superfluid-retriever.js'; +import PaymentReferenceCalculator from '../../src/payment-reference-calculator.js'; import { PaymentTypes } from '@requestnetwork/types'; import { GraphQLClient } from 'graphql-request'; import { mocked } from 'ts-jest/utils'; -import { mockSuperfluidSubgraph } from './mocks'; +import { mockSuperfluidSubgraph } from './mocks.js'; jest.mock('graphql-request'); const graphql = mocked(GraphQLClient.prototype); diff --git a/packages/payment-detection/test/eth/fee-proxy-detector.test.ts b/packages/payment-detection/test/eth/fee-proxy-detector.test.ts index dcde036c66..3efcf518f1 100644 --- a/packages/payment-detection/test/eth/fee-proxy-detector.test.ts +++ b/packages/payment-detection/test/eth/fee-proxy-detector.test.ts @@ -1,7 +1,7 @@ import { CurrencyManager } from '@requestnetwork/currency'; import { AdvancedLogicTypes, PaymentTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { EthFeeProxyPaymentDetector } from '../../src'; -import { mockAdvancedLogicBase } from '../utils'; +import { EthFeeProxyPaymentDetector } from '../../src/index.js'; +import { mockAdvancedLogicBase } from '../utils.js'; let ethFeeProxyDetector: EthFeeProxyPaymentDetector; diff --git a/packages/payment-detection/test/eth/info-retriever.test.ts b/packages/payment-detection/test/eth/info-retriever.test.ts index 7ddb7c4d67..3a12d4f3e2 100644 --- a/packages/payment-detection/test/eth/info-retriever.test.ts +++ b/packages/payment-detection/test/eth/info-retriever.test.ts @@ -1,6 +1,6 @@ import { PaymentTypes } from '@requestnetwork/types'; -import { EthInputDataInfoRetriever } from '../../src/eth/info-retriever'; -import PaymentReferenceCalculator from '../../src/payment-reference-calculator'; +import { EthInputDataInfoRetriever } from '../../src/eth/info-retriever.js'; +import PaymentReferenceCalculator from '../../src/payment-reference-calculator.js'; describe('api/eth/info-retriever', () => { // In this test, we're looking this transaction: diff --git a/packages/payment-detection/test/eth/input-data.test.ts b/packages/payment-detection/test/eth/input-data.test.ts index b71e2769fc..893a648725 100644 --- a/packages/payment-detection/test/eth/input-data.test.ts +++ b/packages/payment-detection/test/eth/input-data.test.ts @@ -6,9 +6,9 @@ import { PaymentTypes, RequestLogicTypes, } from '@requestnetwork/types'; -import { getTheGraphClient } from '../../src/thegraph'; -import { EthInputDataPaymentDetector } from '../../src/eth/input-data'; -import { mockAdvancedLogicBase } from '../utils'; +import { getTheGraphClient } from '../../src/thegraph.js'; +import { EthInputDataPaymentDetector } from '../../src/eth/input-data.js'; +import { mockAdvancedLogicBase } from '../utils.js'; jest.mock('../../src/thegraph/client'); const theGraphClientMock = mocked(getTheGraphClient('')); diff --git a/packages/payment-detection/test/eth/proxy-info-retriever.test.ts b/packages/payment-detection/test/eth/proxy-info-retriever.test.ts index 441f0cef2d..a14cb72025 100644 --- a/packages/payment-detection/test/eth/proxy-info-retriever.test.ts +++ b/packages/payment-detection/test/eth/proxy-info-retriever.test.ts @@ -1,7 +1,7 @@ /* eslint-disable no-invalid-this */ /* eslint-disable no-magic-numbers */ import { PaymentTypes } from '@requestnetwork/types'; -import { EthProxyInfoRetriever } from '../../src/eth/proxy-info-retriever'; +import { EthProxyInfoRetriever } from '../../src/eth/proxy-info-retriever.js'; const proxyContractAddress = '0xf204a4ef082f5c04bb89f7d5e6568b796096735a'; const paymentReferenceMock = '01111111111111111111111111111111111111111111111111'; diff --git a/packages/payment-detection/test/near/near-native-conversion.test.ts b/packages/payment-detection/test/near/near-native-conversion.test.ts index 072c270e86..da124fe9b2 100644 --- a/packages/payment-detection/test/near/near-native-conversion.test.ts +++ b/packages/payment-detection/test/near/near-native-conversion.test.ts @@ -5,15 +5,15 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; import { CurrencyDefinition, CurrencyManager } from '@requestnetwork/currency'; -import { PaymentNetworkFactory } from '../../src/payment-network-factory'; -import PaymentReferenceCalculator from '../../src/payment-reference-calculator'; +import { PaymentNetworkFactory } from '../../src/payment-network-factory.js'; +import PaymentReferenceCalculator from '../../src/payment-reference-calculator.js'; import { NearConversionInfoRetriever, NearConversionNativeTokenPaymentDetector, -} from '../../src/near'; +} from '../../src/near.js'; import { deepCopy } from 'ethers/lib/utils'; import { AdvancedLogic } from '@requestnetwork/advanced-logic'; -import { TheGraphClient } from '../../src'; +import { TheGraphClient } from '../../src/index.js'; jest.mock('graphql-request'); const currencyManager = CurrencyManager.getDefault(); diff --git a/packages/payment-detection/test/near/near-native.test.ts b/packages/payment-detection/test/near/near-native.test.ts index 9f89aec0e4..02c52704ac 100644 --- a/packages/payment-detection/test/near/near-native.test.ts +++ b/packages/payment-detection/test/near/near-native.test.ts @@ -5,9 +5,9 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; import { CurrencyManager } from '@requestnetwork/currency'; -import { PaymentNetworkFactory, TheGraphClient } from '../../src'; -import PaymentReferenceCalculator from '../../src/payment-reference-calculator'; -import { NearInfoRetriever, NearNativeTokenPaymentDetector } from '../../src/near'; +import { PaymentNetworkFactory, TheGraphClient } from '../../src/index.js'; +import PaymentReferenceCalculator from '../../src/payment-reference-calculator.js'; +import { NearInfoRetriever, NearNativeTokenPaymentDetector } from '../../src/near.js'; import { deepCopy } from 'ethers/lib/utils'; import { AdvancedLogic } from '@requestnetwork/advanced-logic'; diff --git a/packages/payment-detection/test/payment-network-factory.test.ts b/packages/payment-detection/test/payment-network-factory.test.ts index acd60a1da4..3d0babc668 100644 --- a/packages/payment-detection/test/payment-network-factory.test.ts +++ b/packages/payment-detection/test/payment-network-factory.test.ts @@ -1,13 +1,13 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; import { CurrencyManager } from '@requestnetwork/currency'; -import { BtcMainnetAddressBasedDetector } from '../src/btc'; +import { BtcMainnetAddressBasedDetector } from '../src/btc.js'; import { DeclarativePaymentDetector, EthInputDataPaymentDetector, PaymentNetworkFactory, -} from '../src'; +} from '../src/index.js'; import { AdvancedLogic } from '@requestnetwork/advanced-logic'; -import { ERC20FeeProxyPaymentDetector } from '../src/erc20/fee-proxy-contract'; +import { ERC20FeeProxyPaymentDetector } from '../src/erc20/fee-proxy-contract.js'; const currencyManager = CurrencyManager.getDefault(); const advancedLogic = new AdvancedLogic(currencyManager); diff --git a/packages/payment-detection/test/payment-reference-calculator.test.ts b/packages/payment-detection/test/payment-reference-calculator.test.ts index a32f0d207a..f6f4380ede 100644 --- a/packages/payment-detection/test/payment-reference-calculator.test.ts +++ b/packages/payment-detection/test/payment-reference-calculator.test.ts @@ -1,4 +1,4 @@ -import PaymentReferenceCalculator from '../src/payment-reference-calculator'; +import PaymentReferenceCalculator from '../src/payment-reference-calculator.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ describe('api/eth/payment-reference-calculator', () => { diff --git a/packages/payment-detection/test/provider.test.ts b/packages/payment-detection/test/provider.test.ts index 2f04e83b51..2a8317cfff 100644 --- a/packages/payment-detection/test/provider.test.ts +++ b/packages/payment-detection/test/provider.test.ts @@ -1,5 +1,9 @@ import { providers } from 'ethers'; -import { getDefaultProvider, initPaymentDetectionApiKeys, setProviderFactory } from '../src'; +import { + getDefaultProvider, + initPaymentDetectionApiKeys, + setProviderFactory, +} from '../src/index.js'; describe('getDefaultProvider', () => { afterEach(() => { diff --git a/packages/payment-detection/test/utils.test.ts b/packages/payment-detection/test/utils.test.ts index 14be79a394..9fb425d8b4 100644 --- a/packages/payment-detection/test/utils.test.ts +++ b/packages/payment-detection/test/utils.test.ts @@ -6,7 +6,7 @@ import { calculateEscrowState, getPaymentReference, formatAddress, -} from '../src'; +} from '../src/index.js'; describe('conversion: padding amounts for Chainlink', () => { const currencyManager = CurrencyManager.getDefault(); diff --git a/packages/payment-processor/package.json b/packages/payment-processor/package.json index b52611c14b..40aecc3360 100644 --- a/packages/payment-processor/package.json +++ b/packages/payment-processor/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/payment-processor", "version": "0.39.0", + "type": "module", "publishConfig": { "access": "public" }, diff --git a/packages/payment-processor/src/index.ts b/packages/payment-processor/src/index.ts index f6b50a77a7..41a11b414d 100644 --- a/packages/payment-processor/src/index.ts +++ b/packages/payment-processor/src/index.ts @@ -1,30 +1,30 @@ -export * from './payment'; -export * from './payment/btc-address-based'; -export * from './payment/erc20'; -export * from './payment/erc20-proxy'; -export * from './payment/erc20-fee-proxy'; -export * from './payment/erc777-stream'; -export * from './payment/erc777-utils'; -export * from './payment/eth-input-data'; -export * from './payment/near-input-data'; -export * from './payment/near-conversion'; -export * from './payment/near-fungible'; -export * from './payment/eth-proxy'; -export * from './payment/eth-fee-proxy'; -export * from './payment/batch-proxy'; -export * from './payment/batch-conversion-proxy'; -export * from './payment/swap-conversion-erc20'; -export * from './payment/swap-any-to-erc20'; -export * from './payment/swap-erc20'; -export * from './payment/erc20-transferable-receivable'; -export * from './payment/swap-erc20-fee-proxy'; -export * from './payment/conversion-erc20'; -export * from './payment/any-to-erc20-proxy'; -export * from './payment/any-to-eth-proxy'; -export * from './payment/encoder-payment'; -export * from './payment/encoder-approval'; -export * as Escrow from './payment/erc20-escrow-payment'; -export * from './payment/prepared-transaction'; -import * as utils from './payment/utils'; +export * from './payment.js'; +export * from './payment/btc-address-based.js'; +export * from './payment/erc20.js'; +export * from './payment/erc20-proxy.js'; +export * from './payment/erc20-fee-proxy.js'; +export * from './payment/erc777-stream.js'; +export * from './payment/erc777-utils.js'; +export * from './payment/eth-input-data.js'; +export * from './payment/near-input-data.js'; +export * from './payment/near-conversion.js'; +export * from './payment/near-fungible.js'; +export * from './payment/eth-proxy.js'; +export * from './payment/eth-fee-proxy.js'; +export * from './payment/batch-proxy.js'; +export * from './payment/batch-conversion-proxy.js'; +export * from './payment/swap-conversion-erc20.js'; +export * from './payment/swap-any-to-erc20.js'; +export * from './payment/swap-erc20.js'; +export * from './payment/erc20-transferable-receivable.js'; +export * from './payment/swap-erc20-fee-proxy.js'; +export * from './payment/conversion-erc20.js'; +export * from './payment/any-to-erc20-proxy.js'; +export * from './payment/any-to-eth-proxy.js'; +export * from './payment/encoder-payment.js'; +export * from './payment/encoder-approval.js'; +export * as Escrow from './payment/erc20-escrow-payment.js'; +export * from './payment/prepared-transaction.js'; +import * as utils from './payment/utils.js'; export { utils }; diff --git a/packages/payment-processor/src/payment/any-to-erc20-proxy.ts b/packages/payment-processor/src/payment/any-to-erc20-proxy.ts index 8f81445381..6a312dce24 100644 --- a/packages/payment-processor/src/payment/any-to-erc20-proxy.ts +++ b/packages/payment-processor/src/payment/any-to-erc20-proxy.ts @@ -9,7 +9,7 @@ import { AnyToERC20PaymentDetector } from '@requestnetwork/payment-detection'; import { Erc20ConversionProxy__factory } from '@requestnetwork/smart-contracts/types'; import { ClientTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { ITransactionOverrides } from './transaction-overrides'; +import { ITransactionOverrides } from './transaction-overrides.js'; import { getAmountToPay, getProxyAddress, @@ -17,10 +17,10 @@ import { getRequestPaymentValues, getSigner, validateConversionFeeProxyRequest, -} from './utils'; +} from './utils.js'; import { padAmountForChainlink } from '@requestnetwork/payment-detection'; -import { IPreparedTransaction } from './prepared-transaction'; -import { IConversionPaymentSettings } from './index'; +import { IPreparedTransaction } from './prepared-transaction.js'; +import { IConversionPaymentSettings } from './index.js'; /** * Processes a transaction to pay a request with an ERC20 currency that is different from the request currency (eg. fiat). diff --git a/packages/payment-processor/src/payment/any-to-eth-proxy.ts b/packages/payment-processor/src/payment/any-to-eth-proxy.ts index 96e602c6db..bc4e396307 100644 --- a/packages/payment-processor/src/payment/any-to-eth-proxy.ts +++ b/packages/payment-processor/src/payment/any-to-eth-proxy.ts @@ -5,12 +5,12 @@ import { AnyToEthFeeProxyPaymentDetector } from '@requestnetwork/payment-detecti import { EthConversionProxy__factory } from '@requestnetwork/smart-contracts/types'; import { ClientTypes, RequestLogicTypes } from '@requestnetwork/types'; -import { ITransactionOverrides } from './transaction-overrides'; -import { getAmountToPay, getProvider, getRequestPaymentValues, getSigner } from './utils'; +import { ITransactionOverrides } from './transaction-overrides.js'; +import { getAmountToPay, getProvider, getRequestPaymentValues, getSigner } from './utils.js'; import { padAmountForChainlink } from '@requestnetwork/payment-detection'; -import { IPreparedTransaction } from './prepared-transaction'; -import { IConversionPaymentSettings } from './index'; -import { getProxyAddress } from './utils'; +import { IPreparedTransaction } from './prepared-transaction.js'; +import { IConversionPaymentSettings } from './index.js'; +import { getProxyAddress } from './utils.js'; /** * Processes a transaction to pay a request with a native token when the request is denominated in another currency diff --git a/packages/payment-processor/src/payment/batch-conversion-proxy.ts b/packages/payment-processor/src/payment/batch-conversion-proxy.ts index 86f4649798..650e9752eb 100644 --- a/packages/payment-processor/src/payment/batch-conversion-proxy.ts +++ b/packages/payment-processor/src/payment/batch-conversion-proxy.ts @@ -8,7 +8,7 @@ import { PaymentTypes, RequestLogicTypes, } from '@requestnetwork/types'; -import { ITransactionOverrides } from './transaction-overrides'; +import { ITransactionOverrides } from './transaction-overrides.js'; import { comparePnTypeAndVersion, getAmountToPay, @@ -19,18 +19,18 @@ import { getSigner, MAX_ALLOWANCE, validateErc20FeeProxyRequest, -} from './utils'; +} from './utils.js'; import { padAmountForChainlink, getPaymentNetworkExtension, } from '@requestnetwork/payment-detection'; -import { IPreparedTransaction } from './prepared-transaction'; -import { EnrichedRequest, IConversionPaymentSettings } from './index'; -import { checkRequestAndGetPathAndCurrency } from './any-to-erc20-proxy'; -import { checkErc20Allowance, encodeApproveAnyErc20 } from './erc20'; +import { IPreparedTransaction } from './prepared-transaction.js'; +import { EnrichedRequest, IConversionPaymentSettings } from './index.js'; +import { checkRequestAndGetPathAndCurrency } from './any-to-erc20-proxy.js'; +import { checkErc20Allowance, encodeApproveAnyErc20 } from './erc20/index.js'; import { IState } from 'types/dist/extension-types'; import { CurrencyDefinition, ICurrencyManager } from '@requestnetwork/currency'; -import { IConversionSettings, IRequestPaymentOptions } from './settings'; +import { IConversionSettings, IRequestPaymentOptions } from './settings.js'; const CURRENCY = RequestLogicTypes.CURRENCY; diff --git a/packages/payment-processor/src/payment/batch-proxy.ts b/packages/payment-processor/src/payment/batch-proxy.ts index 7b3d750a57..9f84dfdcdd 100644 --- a/packages/payment-processor/src/payment/batch-proxy.ts +++ b/packages/payment-processor/src/payment/batch-proxy.ts @@ -3,7 +3,7 @@ import { batchPaymentsArtifact } from '@requestnetwork/smart-contracts'; import { BatchPayments__factory } from '@requestnetwork/smart-contracts/types'; import { ClientTypes } from '@requestnetwork/types'; import { getPaymentNetworkExtension } from '@requestnetwork/payment-detection'; -import { ITransactionOverrides } from './transaction-overrides'; +import { ITransactionOverrides } from './transaction-overrides.js'; import { comparePnTypeAndVersion, getAmountToPay, @@ -11,10 +11,10 @@ import { getRequestPaymentValues, getSigner, validateErc20FeeProxyRequest, -} from './utils'; -import { validateEthFeeProxyRequest } from './eth-fee-proxy'; -import { IPreparedTransaction } from './prepared-transaction'; -import { checkErc20Allowance, encodeApproveAnyErc20 } from './erc20'; +} from './utils.js'; +import { validateEthFeeProxyRequest } from './eth-fee-proxy.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; +import { checkErc20Allowance, encodeApproveAnyErc20 } from './erc20/index.js'; import { EvmChains } from '@requestnetwork/currency'; /** diff --git a/packages/payment-processor/src/payment/btc-address-based.ts b/packages/payment-processor/src/payment/btc-address-based.ts index 260a7cd0b1..106825295b 100644 --- a/packages/payment-processor/src/payment/btc-address-based.ts +++ b/packages/payment-processor/src/payment/btc-address-based.ts @@ -3,7 +3,7 @@ import { getPaymentNetworkExtension } from '@requestnetwork/payment-detection'; import { ClientTypes } from '@requestnetwork/types'; -import { getAmountToPay } from './utils'; +import { getAmountToPay } from './utils.js'; /** * Returns the BIP21 payment URL based on the Request's value diff --git a/packages/payment-processor/src/payment/conversion-erc20.ts b/packages/payment-processor/src/payment/conversion-erc20.ts index f029a95e6c..b493ac97aa 100644 --- a/packages/payment-processor/src/payment/conversion-erc20.ts +++ b/packages/payment-processor/src/payment/conversion-erc20.ts @@ -3,10 +3,10 @@ import { ContractTransaction, Signer, BigNumberish, providers, BigNumber } from import { AnyToERC20PaymentDetector } from '@requestnetwork/payment-detection'; import { ClientTypes } from '@requestnetwork/types'; -import { ITransactionOverrides } from './transaction-overrides'; -import { getProvider, getSigner, getProxyAddress } from './utils'; -import { checkErc20Allowance, encodeApproveAnyErc20 } from './erc20'; -import { IPreparedTransaction } from './prepared-transaction'; +import { ITransactionOverrides } from './transaction-overrides.js'; +import { getProvider, getSigner, getProxyAddress } from './utils.js'; +import { checkErc20Allowance, encodeApproveAnyErc20 } from './erc20/index.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; /** * Processes the approval transaction of a given payment ERC20 to be spent by the conversion proxy, diff --git a/packages/payment-processor/src/payment/encoder-approval.ts b/packages/payment-processor/src/payment/encoder-approval.ts index 2afa09f20f..3823398e47 100644 --- a/packages/payment-processor/src/payment/encoder-approval.ts +++ b/packages/payment-processor/src/payment/encoder-approval.ts @@ -1,17 +1,17 @@ -import { IRequestPaymentOptions } from './settings'; -import { IPreparedTransaction } from './prepared-transaction'; +import { IRequestPaymentOptions } from './settings.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; import { providers, BigNumber } from 'ethers'; -import { hasErc20Approval, prepareApproveErc20 } from './erc20'; +import { hasErc20Approval, prepareApproveErc20 } from './erc20/index.js'; import { ClientTypes, ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; import { hasErc20ApprovalForProxyConversion, prepareApproveErc20ForProxyConversion, -} from './conversion-erc20'; -import { hasApprovalErc20ForSwapToPay, prepareApprovalErc20ForSwapToPay } from './swap-erc20'; +} from './conversion-erc20.js'; +import { hasApprovalErc20ForSwapToPay, prepareApprovalErc20ForSwapToPay } from './swap-erc20.js'; import { hasErc20ApprovalForSwapWithConversion, prepareApprovalErc20ForSwapWithConversionToPay, -} from './swap-conversion-erc20'; +} from './swap-conversion-erc20.js'; import { getPaymentNetworkExtension } from '@requestnetwork/payment-detection'; /** diff --git a/packages/payment-processor/src/payment/encoder-payment.ts b/packages/payment-processor/src/payment/encoder-payment.ts index 3791b82d9f..9833682793 100644 --- a/packages/payment-processor/src/payment/encoder-payment.ts +++ b/packages/payment-processor/src/payment/encoder-payment.ts @@ -1,18 +1,18 @@ -import { IRequestPaymentOptions } from './settings'; -import { IPreparedTransaction } from './prepared-transaction'; +import { IRequestPaymentOptions } from './settings.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; import { providers } from 'ethers'; import { ClientTypes, ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; import { getPaymentNetworkExtension } from '@requestnetwork/payment-detection'; -import { prepareErc20ProxyPaymentTransaction } from './erc20-proxy'; -import { prepareErc20FeeProxyPaymentTransaction } from './erc20-fee-proxy'; -import { prepareAnyToErc20ProxyPaymentTransaction } from './any-to-erc20-proxy'; -import { prepareSwapToPayErc20FeeRequest } from './swap-erc20-fee-proxy'; -import { prepareSwapToPayAnyToErc20Request } from './swap-any-to-erc20'; -import { prepareEthProxyPaymentTransaction } from './eth-proxy'; -import { prepareEthFeeProxyPaymentTransaction } from './eth-fee-proxy'; -import { prepareAnyToEthProxyPaymentTransaction } from './any-to-eth-proxy'; +import { prepareErc20ProxyPaymentTransaction } from './erc20-proxy.js'; +import { prepareErc20FeeProxyPaymentTransaction } from './erc20-fee-proxy.js'; +import { prepareAnyToErc20ProxyPaymentTransaction } from './any-to-erc20-proxy.js'; +import { prepareSwapToPayErc20FeeRequest } from './swap-erc20-fee-proxy.js'; +import { prepareSwapToPayAnyToErc20Request } from './swap-any-to-erc20.js'; +import { prepareEthProxyPaymentTransaction } from './eth-proxy.js'; +import { prepareEthFeeProxyPaymentTransaction } from './eth-fee-proxy.js'; +import { prepareAnyToEthProxyPaymentTransaction } from './any-to-eth-proxy.js'; import { IConversionPaymentSettings } from '.'; -import { prepareErc777StreamPaymentTransaction } from './erc777-stream'; +import { prepareErc777StreamPaymentTransaction } from './erc777-stream.js'; /** * Encodes a transaction to pay a Request in generic way. ERC777 stream excepted. diff --git a/packages/payment-processor/src/payment/erc20-escrow-payment.ts b/packages/payment-processor/src/payment/erc20-escrow-payment.ts index 9745b483ab..8d4496bb1e 100644 --- a/packages/payment-processor/src/payment/erc20-escrow-payment.ts +++ b/packages/payment-processor/src/payment/erc20-escrow-payment.ts @@ -9,10 +9,10 @@ import { getRequestPaymentValues, getSigner, validateRequest, -} from './utils'; -import { ITransactionOverrides } from './transaction-overrides'; -import { encodeApproveAnyErc20 } from './erc20'; -import { IPreparedTransaction } from './prepared-transaction'; +} from './utils.js'; +import { ITransactionOverrides } from './transaction-overrides.js'; +import { encodeApproveAnyErc20 } from './erc20/index.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; import { EvmChains } from '@requestnetwork/currency'; /** diff --git a/packages/payment-processor/src/payment/erc20-fee-proxy.ts b/packages/payment-processor/src/payment/erc20-fee-proxy.ts index 9d21d4b45e..3d8df3a2b1 100644 --- a/packages/payment-processor/src/payment/erc20-fee-proxy.ts +++ b/packages/payment-processor/src/payment/erc20-fee-proxy.ts @@ -6,7 +6,7 @@ import { ClientTypes, ExtensionTypes } from '@requestnetwork/types'; import { getPaymentNetworkExtension } from '@requestnetwork/payment-detection'; import { EvmChains } from '@requestnetwork/currency'; -import { ITransactionOverrides } from './transaction-overrides'; +import { ITransactionOverrides } from './transaction-overrides.js'; import { getAmountToPay, getProvider, @@ -14,8 +14,8 @@ import { getSigner, validateErc20FeeProxyRequest, validateRequest, -} from './utils'; -import { IPreparedTransaction } from './prepared-transaction'; +} from './utils.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; /** * Processes a transaction to pay an ERC20 Request with fees. diff --git a/packages/payment-processor/src/payment/erc20-proxy.ts b/packages/payment-processor/src/payment/erc20-proxy.ts index 3f9b3d2a35..88fab8893d 100644 --- a/packages/payment-processor/src/payment/erc20-proxy.ts +++ b/packages/payment-processor/src/payment/erc20-proxy.ts @@ -4,7 +4,7 @@ import { Erc20PaymentNetwork } from '@requestnetwork/payment-detection'; import { ERC20Proxy__factory } from '@requestnetwork/smart-contracts/types'; import { ClientTypes, ExtensionTypes } from '@requestnetwork/types'; -import { ITransactionOverrides } from './transaction-overrides'; +import { ITransactionOverrides } from './transaction-overrides.js'; import { getAmountToPay, getProxyAddress, @@ -12,8 +12,8 @@ import { getRequestPaymentValues, getSigner, validateRequest, -} from './utils'; -import { IPreparedTransaction } from './prepared-transaction'; +} from './utils.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; /** * Processes a transaction to pay an ERC20 Request. diff --git a/packages/payment-processor/src/payment/erc20-transferable-receivable.ts b/packages/payment-processor/src/payment/erc20-transferable-receivable.ts index 15650fcd0b..afbfa8cfea 100644 --- a/packages/payment-processor/src/payment/erc20-transferable-receivable.ts +++ b/packages/payment-processor/src/payment/erc20-transferable-receivable.ts @@ -15,7 +15,7 @@ import { import { ERC20TransferableReceivable__factory } from '@requestnetwork/smart-contracts/types'; import { ClientTypes } from '@requestnetwork/types'; -import { ITransactionOverrides } from './transaction-overrides'; +import { ITransactionOverrides } from './transaction-overrides.js'; import { getAmountToPay, getProxyAddress, @@ -24,8 +24,8 @@ import { getRequestPaymentValues, validateERC20TransferableReceivable, validatePayERC20TransferableReceivable, -} from './utils'; -import { IPreparedTransaction } from './prepared-transaction'; +} from './utils.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; // The ERC20 receivable smart contract ABI fragment const erc20TransferableReceivableContractAbiFragment = [ diff --git a/packages/payment-processor/src/payment/erc20.ts b/packages/payment-processor/src/payment/erc20.ts index 177ed4da52..3db1b3a545 100644 --- a/packages/payment-processor/src/payment/erc20.ts +++ b/packages/payment-processor/src/payment/erc20.ts @@ -4,12 +4,12 @@ import { Erc20PaymentNetwork, getPaymentNetworkExtension } from '@requestnetwork import { ERC20__factory } from '@requestnetwork/smart-contracts/types'; import { ClientTypes, ExtensionTypes } from '@requestnetwork/types'; -import { _getErc20FeeProxyPaymentUrl, payErc20FeeProxyRequest } from './erc20-fee-proxy'; -import { ISwapSettings, swapErc20FeeProxyRequest } from './swap-erc20-fee-proxy'; -import { _getErc20ProxyPaymentUrl, payErc20ProxyRequest } from './erc20-proxy'; -import { payErc20TransferableReceivableRequest } from './erc20-transferable-receivable'; +import { _getErc20FeeProxyPaymentUrl, payErc20FeeProxyRequest } from './erc20-fee-proxy.js'; +import { ISwapSettings, swapErc20FeeProxyRequest } from './swap-erc20-fee-proxy.js'; +import { _getErc20ProxyPaymentUrl, payErc20ProxyRequest } from './erc20-proxy.js'; +import { payErc20TransferableReceivableRequest } from './erc20-transferable-receivable.js'; -import { ITransactionOverrides } from './transaction-overrides'; +import { ITransactionOverrides } from './transaction-overrides.js'; import { getNetworkProvider, getProvider, @@ -17,8 +17,8 @@ import { getSigner, MAX_ALLOWANCE, validateRequest, -} from './utils'; -import { IPreparedTransaction } from './prepared-transaction'; +} from './utils.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; /** * Processes a transaction to pay an ERC20 Request. diff --git a/packages/payment-processor/src/payment/erc777-stream.ts b/packages/payment-processor/src/payment/erc777-stream.ts index 24033e9319..b357688d04 100644 --- a/packages/payment-processor/src/payment/erc777-stream.ts +++ b/packages/payment-processor/src/payment/erc777-stream.ts @@ -11,10 +11,15 @@ import { import { ClientTypes, ExtensionTypes } from '@requestnetwork/types'; import { getPaymentNetworkExtension } from '@requestnetwork/payment-detection'; -import { getNetworkProvider, getProvider, getRequestPaymentValues, validateRequest } from './utils'; +import { + getNetworkProvider, + getProvider, + getRequestPaymentValues, + validateRequest, +} from './utils.js'; import { Framework } from '@superfluid-finance/sdk-core'; -import { IPreparedTransaction } from './prepared-transaction'; -import { ITransactionOverrides } from './transaction-overrides'; +import { IPreparedTransaction } from './prepared-transaction.js'; +import { ITransactionOverrides } from './transaction-overrides.js'; import * as erc777Artefact from '@openzeppelin/contracts/build/contracts/IERC777.json'; export const RESOLVER_ADDRESS = '0x913bbCFea2f347a24cfCA441d483E7CBAc8De3Db'; diff --git a/packages/payment-processor/src/payment/erc777-utils.ts b/packages/payment-processor/src/payment/erc777-utils.ts index 635d41960b..d3c4e8f80d 100644 --- a/packages/payment-processor/src/payment/erc777-utils.ts +++ b/packages/payment-processor/src/payment/erc777-utils.ts @@ -9,10 +9,10 @@ import { validateRequest, MAX_ALLOWANCE, getRequestPaymentValues, -} from './utils'; -import { getSuperFluidFramework } from './erc777-stream'; -import { checkErc20Allowance, encodeApproveAnyErc20, getAnyErc20Balance } from './erc20'; -import { IPreparedTransaction } from './prepared-transaction'; +} from './utils.js'; +import { getSuperFluidFramework } from './erc777-stream.js'; +import { checkErc20Allowance, encodeApproveAnyErc20, getAnyErc20Balance } from './erc20/index.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; import { ERC20Token } from '@superfluid-finance/sdk-core'; /** diff --git a/packages/payment-processor/src/payment/eth-fee-proxy.ts b/packages/payment-processor/src/payment/eth-fee-proxy.ts index f96cc74246..8f3858aea2 100644 --- a/packages/payment-processor/src/payment/eth-fee-proxy.ts +++ b/packages/payment-processor/src/payment/eth-fee-proxy.ts @@ -4,7 +4,7 @@ import { ClientTypes, ExtensionTypes } from '@requestnetwork/types'; import { EthFeeProxyPaymentDetector } from '@requestnetwork/payment-detection'; import { EthereumFeeProxy__factory } from '@requestnetwork/smart-contracts/types'; -import { ITransactionOverrides } from './transaction-overrides'; +import { ITransactionOverrides } from './transaction-overrides.js'; import { getAmountToPay, getProxyAddress, @@ -12,8 +12,8 @@ import { getRequestPaymentValues, getSigner, validateRequest, -} from './utils'; -import { IPreparedTransaction } from './prepared-transaction'; +} from './utils.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; /** * Processes a transaction to pay an ETH Request with fees. diff --git a/packages/payment-processor/src/payment/eth-input-data.ts b/packages/payment-processor/src/payment/eth-input-data.ts index 0eaa87637d..ddf0026097 100644 --- a/packages/payment-processor/src/payment/eth-input-data.ts +++ b/packages/payment-processor/src/payment/eth-input-data.ts @@ -2,15 +2,15 @@ import { ContractTransaction, Signer, BigNumberish, providers } from 'ethers'; import { ClientTypes, ExtensionTypes } from '@requestnetwork/types'; -import { ITransactionOverrides } from './transaction-overrides'; +import { ITransactionOverrides } from './transaction-overrides.js'; import { getAmountToPay, getProvider, getRequestPaymentValues, getSigner, validateRequest, -} from './utils'; -import { IPreparedTransaction } from './prepared-transaction'; +} from './utils.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; /** * processes the transaction to pay an ETH request. diff --git a/packages/payment-processor/src/payment/eth-proxy.ts b/packages/payment-processor/src/payment/eth-proxy.ts index de97969d2f..818f9ea097 100644 --- a/packages/payment-processor/src/payment/eth-proxy.ts +++ b/packages/payment-processor/src/payment/eth-proxy.ts @@ -2,7 +2,7 @@ import { BigNumberish, ContractTransaction, providers, Signer } from 'ethers'; import { ClientTypes, ExtensionTypes } from '@requestnetwork/types'; import { EthInputDataPaymentDetector } from '@requestnetwork/payment-detection'; import { EthereumProxy__factory } from '@requestnetwork/smart-contracts/types'; -import { ITransactionOverrides } from './transaction-overrides'; +import { ITransactionOverrides } from './transaction-overrides.js'; import { getAmountToPay, getProxyAddress, @@ -10,8 +10,8 @@ import { getRequestPaymentValues, getSigner, validateRequest, -} from './utils'; -import { IPreparedTransaction } from './prepared-transaction'; +} from './utils.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; /** * Processes a transaction to pay an ETH Request with the proxy contract. diff --git a/packages/payment-processor/src/payment/index.ts b/packages/payment-processor/src/payment/index.ts index 7487efa31d..48409782b2 100644 --- a/packages/payment-processor/src/payment/index.ts +++ b/packages/payment-processor/src/payment/index.ts @@ -2,26 +2,26 @@ import { ContractTransaction, Signer, BigNumber, BigNumberish, providers } from import { ClientTypes, ExtensionTypes, TypesUtils } from '@requestnetwork/types'; -import { getBtcPaymentUrl } from './btc-address-based'; -import { _getErc20PaymentUrl, getAnyErc20Balance } from './erc20'; -import { payErc20Request } from './erc20'; -import { payErc777StreamRequest } from './erc777-stream'; -import { _getEthPaymentUrl, payEthInputDataRequest } from './eth-input-data'; -import { payEthFeeProxyRequest } from './eth-fee-proxy'; -import { ITransactionOverrides } from './transaction-overrides'; -import { getNetworkProvider, getProvider, getSigner } from './utils'; -import { ISwapSettings } from './swap-erc20-fee-proxy'; +import { getBtcPaymentUrl } from './btc-address-based.js'; +import { _getErc20PaymentUrl, getAnyErc20Balance } from './erc20/index.js'; +import { payErc20Request } from './erc20/index.js'; +import { payErc777StreamRequest } from './erc777-stream.js'; +import { _getEthPaymentUrl, payEthInputDataRequest } from './eth-input-data.js'; +import { payEthFeeProxyRequest } from './eth-fee-proxy.js'; +import { ITransactionOverrides } from './transaction-overrides.js'; +import { getNetworkProvider, getProvider, getSigner } from './utils.js'; +import { ISwapSettings } from './swap-erc20-fee-proxy.js'; import { RequestLogicTypes } from '@requestnetwork/types'; -import { payAnyToErc20ProxyRequest } from './any-to-erc20-proxy'; -import { payAnyToEthProxyRequest } from './any-to-eth-proxy'; +import { payAnyToErc20ProxyRequest } from './any-to-erc20-proxy.js'; +import { payAnyToEthProxyRequest } from './any-to-eth-proxy.js'; import { WalletConnection } from 'near-api-js'; -import { isNearAccountSolvent } from './utils-near'; +import { isNearAccountSolvent } from './utils-near.js'; import { ICurrencyManager, NearChains } from '@requestnetwork/currency'; -import { encodeRequestErc20Approval } from './encoder-approval'; -import { encodeRequestPayment } from './encoder-payment'; -import { IPreparedTransaction } from './prepared-transaction'; -import { IRequestPaymentOptions } from './settings'; -export { INearTransactionCallback } from './utils-near'; +import { encodeRequestErc20Approval } from './encoder-approval.js'; +import { encodeRequestPayment } from './encoder-payment.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; +import { IRequestPaymentOptions } from './settings.js'; +export { INearTransactionCallback } from './utils-near.js'; export const noConversionNetworks = [ ExtensionTypes.PAYMENT_NETWORK_ID.ERC777_STREAM, diff --git a/packages/payment-processor/src/payment/near-conversion.ts b/packages/payment-processor/src/payment/near-conversion.ts index 198a908978..6897b70de3 100644 --- a/packages/payment-processor/src/payment/near-conversion.ts +++ b/packages/payment-processor/src/payment/near-conversion.ts @@ -8,8 +8,8 @@ import { validateRequest, getAmountToPay, getPaymentExtensionVersion, -} from './utils'; -import { INearTransactionCallback, processNearPaymentWithConversion } from './utils-near'; +} from './utils.js'; +import { INearTransactionCallback, processNearPaymentWithConversion } from './utils-near.js'; import { IConversionPaymentSettings } from '.'; import { CurrencyManager, NearChains, UnsupportedCurrencyError } from '@requestnetwork/currency'; diff --git a/packages/payment-processor/src/payment/near-fungible.ts b/packages/payment-processor/src/payment/near-fungible.ts index 938ca65285..2e0cd9e85c 100644 --- a/packages/payment-processor/src/payment/near-fungible.ts +++ b/packages/payment-processor/src/payment/near-fungible.ts @@ -4,12 +4,12 @@ import { WalletConnection } from 'near-api-js'; import { erc20FeeProxyArtifact } from '@requestnetwork/smart-contracts'; import { ClientTypes, ExtensionTypes } from '@requestnetwork/types'; -import { getRequestPaymentValues, validateRequest, getAmountToPay } from './utils'; +import { getRequestPaymentValues, validateRequest, getAmountToPay } from './utils.js'; import { INearTransactionCallback, isReceiverReady, processNearFungiblePayment, -} from './utils-near'; +} from './utils-near.js'; import { NearChains } from '@requestnetwork/currency'; /** diff --git a/packages/payment-processor/src/payment/near-input-data.ts b/packages/payment-processor/src/payment/near-input-data.ts index bbad8237b3..3b44b921c2 100644 --- a/packages/payment-processor/src/payment/near-input-data.ts +++ b/packages/payment-processor/src/payment/near-input-data.ts @@ -8,8 +8,8 @@ import { getPaymentExtensionVersion, getRequestPaymentValues, validateRequest, -} from './utils'; -import { INearTransactionCallback, processNearPayment } from './utils-near'; +} from './utils.js'; +import { INearTransactionCallback, processNearPayment } from './utils-near.js'; import { NearChains } from '@requestnetwork/currency'; /** diff --git a/packages/payment-processor/src/payment/settings.ts b/packages/payment-processor/src/payment/settings.ts index 8dac067680..686da14561 100644 --- a/packages/payment-processor/src/payment/settings.ts +++ b/packages/payment-processor/src/payment/settings.ts @@ -1,7 +1,7 @@ import { ICurrencyManager } from '@requestnetwork/currency'; import { RequestLogicTypes } from '@requestnetwork/types'; import { BigNumber, BigNumberish } from 'ethers'; -import { ITransactionOverrides } from './transaction-overrides'; +import { ITransactionOverrides } from './transaction-overrides.js'; /** * Approval settings diff --git a/packages/payment-processor/src/payment/swap-any-to-erc20.ts b/packages/payment-processor/src/payment/swap-any-to-erc20.ts index 5b69b4989a..c5bdd68c93 100644 --- a/packages/payment-processor/src/payment/swap-any-to-erc20.ts +++ b/packages/payment-processor/src/payment/swap-any-to-erc20.ts @@ -12,12 +12,12 @@ import { getRequestPaymentValues, getSigner, validateConversionFeeProxyRequest, -} from './utils'; +} from './utils.js'; import { CurrencyManager, EvmChains, UnsupportedCurrencyError } from '@requestnetwork/currency'; -import { IRequestPaymentOptions } from './settings'; -import { IPreparedTransaction } from './prepared-transaction'; +import { IRequestPaymentOptions } from './settings.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; -export { ISwapSettings } from './swap-erc20-fee-proxy'; +export { ISwapSettings } from './swap-erc20-fee-proxy.js'; /** * Processes a transaction to swap tokens and pay an ERC20 Request through a proxy with fees. diff --git a/packages/payment-processor/src/payment/swap-conversion-erc20.ts b/packages/payment-processor/src/payment/swap-conversion-erc20.ts index 5e03bf7530..7e3801112b 100644 --- a/packages/payment-processor/src/payment/swap-conversion-erc20.ts +++ b/packages/payment-processor/src/payment/swap-conversion-erc20.ts @@ -3,10 +3,10 @@ import { ContractTransaction, providers, Signer, BigNumberish, BigNumber } from import { erc20SwapConversionArtifact } from '@requestnetwork/smart-contracts'; import { ClientTypes, ExtensionTypes } from '@requestnetwork/types'; -import { ITransactionOverrides } from './transaction-overrides'; -import { getProvider, getSigner } from './utils'; -import { checkErc20Allowance, encodeApproveAnyErc20 } from './erc20'; -import { IPreparedTransaction } from './prepared-transaction'; +import { ITransactionOverrides } from './transaction-overrides.js'; +import { getProvider, getSigner } from './utils.js'; +import { checkErc20Allowance, encodeApproveAnyErc20 } from './erc20/index.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; /** * Processes the approval transaction of a given payment ERC20 to be spent by the swap router, diff --git a/packages/payment-processor/src/payment/swap-erc20-fee-proxy.ts b/packages/payment-processor/src/payment/swap-erc20-fee-proxy.ts index 6adc58379b..f9e62bfc1c 100644 --- a/packages/payment-processor/src/payment/swap-erc20-fee-proxy.ts +++ b/packages/payment-processor/src/payment/swap-erc20-fee-proxy.ts @@ -4,7 +4,7 @@ import { erc20FeeProxyArtifact, erc20SwapToPayArtifact } from '@requestnetwork/s import { ERC20SwapToPay__factory } from '@requestnetwork/smart-contracts/types'; import { ClientTypes } from '@requestnetwork/types'; -import { ITransactionOverrides } from './transaction-overrides'; +import { ITransactionOverrides } from './transaction-overrides.js'; import { getAmountToPay, getProvider, @@ -12,8 +12,8 @@ import { getRequestPaymentValues, getSigner, validateErc20FeeProxyRequest, -} from './utils'; -import { IPreparedTransaction } from './prepared-transaction'; +} from './utils.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; import { Erc20PaymentNetwork } from '@requestnetwork/payment-detection'; import { EvmChains } from '@requestnetwork/currency'; diff --git a/packages/payment-processor/src/payment/swap-erc20.ts b/packages/payment-processor/src/payment/swap-erc20.ts index 655078de51..308315ce8b 100644 --- a/packages/payment-processor/src/payment/swap-erc20.ts +++ b/packages/payment-processor/src/payment/swap-erc20.ts @@ -3,10 +3,10 @@ import { BigNumber, BigNumberish, ContractTransaction, providers, Signer } from import { erc20SwapToPayArtifact } from '@requestnetwork/smart-contracts'; import { ClientTypes } from '@requestnetwork/types'; -import { ITransactionOverrides } from './transaction-overrides'; -import { getProvider, getSigner } from './utils'; -import { checkErc20Allowance, encodeApproveAnyErc20 } from './erc20'; -import { IPreparedTransaction } from './prepared-transaction'; +import { ITransactionOverrides } from './transaction-overrides.js'; +import { getProvider, getSigner } from './utils.js'; +import { checkErc20Allowance, encodeApproveAnyErc20 } from './erc20/index.js'; +import { IPreparedTransaction } from './prepared-transaction.js'; import { EvmChains } from '@requestnetwork/currency'; /** diff --git a/packages/payment-processor/src/payment/utils.ts b/packages/payment-processor/src/payment/utils.ts index a340c6fc69..f531b0f90a 100644 --- a/packages/payment-processor/src/payment/utils.ts +++ b/packages/payment-processor/src/payment/utils.ts @@ -10,7 +10,7 @@ import { import { EvmChains, getCurrencyHash } from '@requestnetwork/currency'; import { ERC20__factory } from '@requestnetwork/smart-contracts/types'; import { getPaymentNetworkExtension } from '@requestnetwork/payment-detection'; -import { getReceivableTokenIdForRequest } from './erc20-transferable-receivable'; +import { getReceivableTokenIdForRequest } from './erc20-transferable-receivable.js'; /** @constant MAX_ALLOWANCE set to the max uint256 value */ export const MAX_ALLOWANCE = BigNumber.from(2).pow(256).sub(1); diff --git a/packages/payment-processor/test/payment/any-to-erc20-batch-proxy.test.ts b/packages/payment-processor/test/payment/any-to-erc20-batch-proxy.test.ts index acd897b2c4..e27fbb5a1a 100644 --- a/packages/payment-processor/test/payment/any-to-erc20-batch-proxy.test.ts +++ b/packages/payment-processor/test/payment/any-to-erc20-batch-proxy.test.ts @@ -14,7 +14,7 @@ import { IConversionPaymentSettings, payBatchConversionProxyRequest, prepareBatchConversionPaymentTransaction, -} from '../../src'; +} from '../../src/index.js'; import { deepCopy } from '@requestnetwork/utils'; import { revokeErc20Approval } from '@requestnetwork/payment-processor/src/payment/utils'; import { batchConversionPaymentsArtifact } from '@requestnetwork/smart-contracts'; diff --git a/packages/payment-processor/test/payment/any-to-erc20-proxy.test.ts b/packages/payment-processor/test/payment/any-to-erc20-proxy.test.ts index cebfde614b..ca5f97a13f 100644 --- a/packages/payment-processor/test/payment/any-to-erc20-proxy.test.ts +++ b/packages/payment-processor/test/payment/any-to-erc20-proxy.test.ts @@ -10,12 +10,12 @@ import { approveErc20ForProxyConversionIfNeeded, IConversionPaymentSettings, payAnyToErc20ProxyRequest, -} from '../../src'; +} from '../../src/index.js'; import { ERC20__factory } from '@requestnetwork/smart-contracts/types'; -import { currencyManager } from './shared'; +import { currencyManager } from './shared.js'; import { UnsupportedCurrencyError } from '@requestnetwork/currency'; import { AnyToERC20PaymentDetector } from '@requestnetwork/payment-detection'; -import { getProxyAddress, MAX_ALLOWANCE, revokeErc20Approval } from '../../src/payment/utils'; +import { getProxyAddress, MAX_ALLOWANCE, revokeErc20Approval } from '../../src/payment/utils.js'; // Cf. ERC20Alpha in TestERC20.sol const erc20ContractAddress = '0x38cF23C52Bb4B13F051Aec09580a2dE845a7FA35'; diff --git a/packages/payment-processor/test/payment/any-to-eth-proxy.test.ts b/packages/payment-processor/test/payment/any-to-eth-proxy.test.ts index 8df0e87944..86ce279949 100644 --- a/packages/payment-processor/test/payment/any-to-eth-proxy.test.ts +++ b/packages/payment-processor/test/payment/any-to-eth-proxy.test.ts @@ -6,8 +6,8 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import { IConversionPaymentSettings, payAnyToEthProxyRequest } from '../../src'; -import { currencyManager } from './shared'; +import { IConversionPaymentSettings, payAnyToEthProxyRequest } from '../../src/index.js'; +import { currencyManager } from './shared.js'; const paymentSettings: IConversionPaymentSettings = { maxToSpend: '2500000000000000', diff --git a/packages/payment-processor/test/payment/any-to-near.test.ts b/packages/payment-processor/test/payment/any-to-near.test.ts index 88eda1750e..f3e3d39597 100644 --- a/packages/payment-processor/test/payment/any-to-near.test.ts +++ b/packages/payment-processor/test/payment/any-to-near.test.ts @@ -1,8 +1,8 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; import { PaymentReferenceCalculator } from '@requestnetwork/payment-detection'; -import { IConversionPaymentSettings, payNearConversionRequest } from '../../src'; -import * as nearUtils from '../../src/payment/utils-near'; +import { IConversionPaymentSettings, payNearConversionRequest } from '../../src/index.js'; +import * as nearUtils from '../../src/payment/utils-near.js'; import { deepCopy } from '@requestnetwork/utils'; /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/payment-processor/test/payment/btc-address-based.test.ts b/packages/payment-processor/test/payment/btc-address-based.test.ts index 85460778cf..ee58dbb686 100644 --- a/packages/payment-processor/test/payment/btc-address-based.test.ts +++ b/packages/payment-processor/test/payment/btc-address-based.test.ts @@ -7,7 +7,7 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; -import { getBtcPaymentUrl } from '../../src'; +import { getBtcPaymentUrl } from '../../src/index.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/await-thenable */ diff --git a/packages/payment-processor/test/payment/encoder-approval.test.ts b/packages/payment-processor/test/payment/encoder-approval.test.ts index e7a95dabde..14c3647486 100644 --- a/packages/payment-processor/test/payment/encoder-approval.test.ts +++ b/packages/payment-processor/test/payment/encoder-approval.test.ts @@ -6,15 +6,15 @@ import { IdentityTypes, RequestLogicTypes, } from '@requestnetwork/types'; -import { encodeRequestErc20ApprovalIfNeeded, IPreparedTransaction } from '../../src'; -import { getProxyAddress, MAX_ALLOWANCE, revokeErc20Approval } from '../../src/payment/utils'; +import { encodeRequestErc20ApprovalIfNeeded, IPreparedTransaction } from '../../src/index.js'; +import { getProxyAddress, MAX_ALLOWANCE, revokeErc20Approval } from '../../src/payment/utils.js'; import { AnyToERC20PaymentDetector, Erc20PaymentNetwork } from '@requestnetwork/payment-detection'; -import { currencyManager } from './shared'; +import { currencyManager } from './shared.js'; import { erc20SwapConversionArtifact, erc20SwapToPayArtifact, } from '@requestnetwork/smart-contracts'; -import { IConversionSettings } from '../../src/payment/settings'; +import { IConversionSettings } from '../../src/payment/settings.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/await-thenable */ diff --git a/packages/payment-processor/test/payment/encoder-payment.test.ts b/packages/payment-processor/test/payment/encoder-payment.test.ts index d2a85f9f32..7efc586096 100644 --- a/packages/payment-processor/test/payment/encoder-payment.test.ts +++ b/packages/payment-processor/test/payment/encoder-payment.test.ts @@ -10,8 +10,8 @@ import { encodeRequestPayment, encodeRequestPaymentWithStream, prepareCloseStreamTransaction, -} from '../../src'; -import { getProxyAddress, MAX_ALLOWANCE } from '../../src/payment/utils'; +} from '../../src/index.js'; +import { getProxyAddress, MAX_ALLOWANCE } from '../../src/payment/utils.js'; import { AnyToERC20PaymentDetector, AnyToEthFeeProxyPaymentDetector, @@ -19,12 +19,12 @@ import { EthFeeProxyPaymentDetector, EthInputDataPaymentDetector, } from '@requestnetwork/payment-detection'; -import { currencyManager } from './shared'; +import { currencyManager } from './shared.js'; import { erc20SwapConversionArtifact, erc20SwapToPayArtifact, } from '@requestnetwork/smart-contracts'; -import { IConversionSettings } from '../../src/payment/settings'; +import { IConversionSettings } from '../../src/payment/settings.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/await-thenable */ diff --git a/packages/payment-processor/test/payment/encoder.test.ts b/packages/payment-processor/test/payment/encoder.test.ts index b4772a0d92..2ed3f6997f 100644 --- a/packages/payment-processor/test/payment/encoder.test.ts +++ b/packages/payment-processor/test/payment/encoder.test.ts @@ -5,15 +5,15 @@ import { IdentityTypes, RequestLogicTypes, } from '@requestnetwork/types'; -import { encodeRequestApprovalAndPayment } from '../../src'; +import { encodeRequestApprovalAndPayment } from '../../src/index.js'; import { IApprovalSettings, IConversionSettings, IRequestPaymentOptions, -} from '../../src/payment/settings'; -import { currencyManager } from './shared'; +} from '../../src/payment/settings.js'; +import { currencyManager } from './shared.js'; import { ERC20__factory } from '@requestnetwork/smart-contracts/types'; -import { MAX_ALLOWANCE } from '../../src/payment/utils'; +import { MAX_ALLOWANCE } from '../../src/payment/utils.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/await-thenable */ diff --git a/packages/payment-processor/test/payment/erc20-batch-proxy.test.ts b/packages/payment-processor/test/payment/erc20-batch-proxy.test.ts index 867fa2d718..0d09b8fd18 100644 --- a/packages/payment-processor/test/payment/erc20-batch-proxy.test.ts +++ b/packages/payment-processor/test/payment/erc20-batch-proxy.test.ts @@ -15,8 +15,8 @@ import { getErc20Balance, payBatchProxyRequest, prepareBatchPaymentTransaction, -} from '../../src'; -import { getRequestPaymentValues } from '../../src/payment/utils'; +} from '../../src/index.js'; +import { getRequestPaymentValues } from '../../src/payment/utils.js'; import { CurrencyTypes } from '@requestnetwork/types/src'; /* eslint-disable no-magic-numbers */ diff --git a/packages/payment-processor/test/payment/erc20-escrow-payment.test.ts b/packages/payment-processor/test/payment/erc20-escrow-payment.test.ts index 489f4c9f1d..2e5ac0e14e 100644 --- a/packages/payment-processor/test/payment/erc20-escrow-payment.test.ts +++ b/packages/payment-processor/test/payment/erc20-escrow-payment.test.ts @@ -7,11 +7,11 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import { Escrow } from '../../src/'; -import { getRequestPaymentValues, getSigner } from '../../src/payment/utils'; +import { Escrow } from '../../src/.js'; +import { getRequestPaymentValues, getSigner } from '../../src/payment/utils.js'; import { erc20EscrowToPayArtifact } from '@requestnetwork/smart-contracts'; -import { getErc20Balance } from '../../src'; +import { getErc20Balance } from '../../src/index.js'; /* eslint-disable no-magic-numbers */ /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/payment-processor/test/payment/erc20-fee-proxy-near.test.ts b/packages/payment-processor/test/payment/erc20-fee-proxy-near.test.ts index e114acf178..de46eda0a9 100644 --- a/packages/payment-processor/test/payment/erc20-fee-proxy-near.test.ts +++ b/packages/payment-processor/test/payment/erc20-fee-proxy-near.test.ts @@ -2,8 +2,8 @@ import { ExtensionTypes, RequestLogicTypes } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; import { PaymentReferenceCalculator } from '@requestnetwork/payment-detection'; -import * as nearUtils from '../../src/payment/utils-near'; -import { payNearFungibleRequest } from '../../src/payment/near-fungible'; +import * as nearUtils from '../../src/payment/utils-near.js'; +import { payNearFungibleRequest } from '../../src/payment/near-fungible.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/await-thenable */ diff --git a/packages/payment-processor/test/payment/erc20-fee-proxy.test.ts b/packages/payment-processor/test/payment/erc20-fee-proxy.test.ts index eaf7f1af5c..e089e5fd5f 100644 --- a/packages/payment-processor/test/payment/erc20-fee-proxy.test.ts +++ b/packages/payment-processor/test/payment/erc20-fee-proxy.test.ts @@ -16,8 +16,8 @@ import { getErc20Balance, payErc20FeeProxyRequest, prepareErc20FeeProxyPaymentTransaction, -} from '../../src'; -import { getRequestPaymentValues } from '../../src/payment/utils'; +} from '../../src/index.js'; +import { getRequestPaymentValues } from '../../src/payment/utils.js'; /* eslint-disable no-magic-numbers */ /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/payment-processor/test/payment/erc20-proxy.test.ts b/packages/payment-processor/test/payment/erc20-proxy.test.ts index dee210f1c8..06f675c56b 100644 --- a/packages/payment-processor/test/payment/erc20-proxy.test.ts +++ b/packages/payment-processor/test/payment/erc20-proxy.test.ts @@ -8,9 +8,9 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import { approveErc20, getErc20Balance } from '../../src/payment/erc20'; -import { _getErc20ProxyPaymentUrl, payErc20ProxyRequest } from '../../src/payment/erc20-proxy'; -import { getRequestPaymentValues } from '../../src/payment/utils'; +import { approveErc20, getErc20Balance } from '../../src/payment/erc20.js'; +import { _getErc20ProxyPaymentUrl, payErc20ProxyRequest } from '../../src/payment/erc20-proxy.js'; +import { getRequestPaymentValues } from '../../src/payment/utils.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/await-thenable */ diff --git a/packages/payment-processor/test/payment/erc20-transferable-receivable.test.ts b/packages/payment-processor/test/payment/erc20-transferable-receivable.test.ts index 9a063b1127..786ff03b06 100644 --- a/packages/payment-processor/test/payment/erc20-transferable-receivable.test.ts +++ b/packages/payment-processor/test/payment/erc20-transferable-receivable.test.ts @@ -11,13 +11,13 @@ import { deepCopy } from '@requestnetwork/utils'; import { Erc20PaymentNetwork, PaymentReferenceCalculator } from '@requestnetwork/payment-detection'; import { ERC20TransferableReceivable__factory } from '@requestnetwork/smart-contracts/types'; -import { approveErc20, getErc20Balance } from '../../src/payment/erc20'; +import { approveErc20, getErc20Balance } from '../../src/payment/erc20.js'; import { getReceivableTokenIdForRequest, mintErc20TransferableReceivable, payErc20TransferableReceivableRequest, -} from '../../src/payment/erc20-transferable-receivable'; -import { getProxyAddress } from '../../src/payment/utils'; +} from '../../src/payment/erc20-transferable-receivable.js'; +import { getProxyAddress } from '../../src/payment/utils.js'; /* eslint-disable no-magic-numbers */ /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/payment-processor/test/payment/erc20.test.ts b/packages/payment-processor/test/payment/erc20.test.ts index 2d59e91df8..3768fb0dbd 100644 --- a/packages/payment-processor/test/payment/erc20.test.ts +++ b/packages/payment-processor/test/payment/erc20.test.ts @@ -12,8 +12,8 @@ import { checkErc20Allowance, getErc20Balance, hasErc20Approval, -} from '../../src'; -import { getProxyAddress, revokeErc20Approval } from '../../src/payment/utils'; +} from '../../src/index.js'; +import { getProxyAddress, revokeErc20Approval } from '../../src/payment/utils.js'; import { Erc20PaymentNetwork } from '@requestnetwork/payment-detection'; /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/payment-processor/test/payment/erc777-stream.test.ts b/packages/payment-processor/test/payment/erc777-stream.test.ts index 3e1fa26455..13e321a4e0 100644 --- a/packages/payment-processor/test/payment/erc777-stream.test.ts +++ b/packages/payment-processor/test/payment/erc777-stream.test.ts @@ -16,9 +16,9 @@ import { makeErc777OneOffPayment, payErc777StreamRequest, RESOLVER_ADDRESS, -} from '../../src/payment/erc777-stream'; -import { getRequestPaymentValues } from '../../src/payment/utils'; -import { wrapUnderlyingToken } from '../../src/payment/erc777-utils'; +} from '../../src/payment/erc777-stream.js'; +import { getRequestPaymentValues } from '../../src/payment/utils.js'; +import { wrapUnderlyingToken } from '../../src/payment/erc777-utils.js'; const daiABI = require('../abis/fDAIABI'); /* eslint-disable no-magic-numbers */ diff --git a/packages/payment-processor/test/payment/erc777-utils.test.ts b/packages/payment-processor/test/payment/erc777-utils.test.ts index 7cc6c54166..af647d0611 100644 --- a/packages/payment-processor/test/payment/erc777-utils.test.ts +++ b/packages/payment-processor/test/payment/erc777-utils.test.ts @@ -14,8 +14,8 @@ import { getUnderlyingTokenBalanceOf, unwrapSuperToken, wrapUnderlyingToken, -} from '../../src/payment/erc777-utils'; -import { getErc20Balance } from '../../src/payment/erc20'; +} from '../../src/payment/erc777-utils.js'; +import { getErc20Balance } from '../../src/payment/erc20.js'; const daiABI = require('../abis/fDAIABI'); /* eslint-disable no-magic-numbers */ diff --git a/packages/payment-processor/test/payment/eth-batch-proxy.test.ts b/packages/payment-processor/test/payment/eth-batch-proxy.test.ts index 20fd0df5f4..5a914eadc2 100644 --- a/packages/payment-processor/test/payment/eth-batch-proxy.test.ts +++ b/packages/payment-processor/test/payment/eth-batch-proxy.test.ts @@ -9,8 +9,8 @@ import { } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import { payBatchProxyRequest, encodePayBatchRequest } from '../../src/payment/batch-proxy'; -import { getRequestPaymentValues } from '../../src/payment/utils'; +import { payBatchProxyRequest, encodePayBatchRequest } from '../../src/payment/batch-proxy.js'; +import { getRequestPaymentValues } from '../../src/payment/utils.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/await-thenable */ diff --git a/packages/payment-processor/test/payment/eth-fee-proxy.test.ts b/packages/payment-processor/test/payment/eth-fee-proxy.test.ts index 812bfca72a..326f7aaa79 100644 --- a/packages/payment-processor/test/payment/eth-fee-proxy.test.ts +++ b/packages/payment-processor/test/payment/eth-fee-proxy.test.ts @@ -10,8 +10,8 @@ import { deepCopy } from '@requestnetwork/utils'; import { encodePayEthFeeProxyRequest, payEthFeeProxyRequest, -} from '../../src/payment/eth-fee-proxy'; -import { getRequestPaymentValues } from '../../src/payment/utils'; +} from '../../src/payment/eth-fee-proxy.js'; +import { getRequestPaymentValues } from '../../src/payment/utils.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/await-thenable */ diff --git a/packages/payment-processor/test/payment/eth-input-data.test.ts b/packages/payment-processor/test/payment/eth-input-data.test.ts index ea7b18c369..fba3e2f036 100644 --- a/packages/payment-processor/test/payment/eth-input-data.test.ts +++ b/packages/payment-processor/test/payment/eth-input-data.test.ts @@ -9,8 +9,8 @@ import { } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import { _getEthPaymentUrl, payEthInputDataRequest } from '../../src/payment/eth-input-data'; -import { getRequestPaymentValues } from '../../src/payment/utils'; +import { _getEthPaymentUrl, payEthInputDataRequest } from '../../src/payment/eth-input-data.js'; +import { getRequestPaymentValues } from '../../src/payment/utils.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/await-thenable */ diff --git a/packages/payment-processor/test/payment/eth-proxy.test.ts b/packages/payment-processor/test/payment/eth-proxy.test.ts index e620ef284f..d9228298de 100644 --- a/packages/payment-processor/test/payment/eth-proxy.test.ts +++ b/packages/payment-processor/test/payment/eth-proxy.test.ts @@ -13,8 +13,8 @@ import { encodePayEthProxyRequest, payEthProxyRequest, prepareEthProxyPaymentTransaction, -} from '../../src/payment/eth-proxy'; -import { getRequestPaymentValues } from '../../src/payment/utils'; +} from '../../src/payment/eth-proxy.js'; +import { getRequestPaymentValues } from '../../src/payment/utils.js'; import { ethereumProxyArtifact } from '@requestnetwork/smart-contracts'; /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/payment-processor/test/payment/index.test.ts b/packages/payment-processor/test/payment/index.test.ts index 6d41af885a..86321e00d6 100644 --- a/packages/payment-processor/test/payment/index.test.ts +++ b/packages/payment-processor/test/payment/index.test.ts @@ -8,13 +8,13 @@ import { payRequest, swapToPayRequest, isSolvent, -} from '../../src/payment'; -import { payNearInputDataRequest } from '../../src/payment/near-input-data'; -import * as btcModule from '../../src/payment/btc-address-based'; -import * as erc777Module from '../../src/payment/erc777-stream'; -import * as erc20Module from '../../src/payment/erc20'; -import * as ethModule from '../../src/payment/eth-input-data'; -import * as nearUtils from '../../src/payment/utils-near'; +} from '../../src/payment.js'; +import { payNearInputDataRequest } from '../../src/payment/near-input-data.js'; +import * as btcModule from '../../src/payment/btc-address-based.js'; +import * as erc777Module from '../../src/payment/erc777-stream.js'; +import * as erc20Module from '../../src/payment/erc20.js'; +import * as ethModule from '../../src/payment/eth-input-data.js'; +import * as nearUtils from '../../src/payment/utils-near.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/await-thenable */ diff --git a/packages/payment-processor/test/payment/swap-any-to-erc20.test.ts b/packages/payment-processor/test/payment/swap-any-to-erc20.test.ts index bf54913f1d..67a02ca689 100644 --- a/packages/payment-processor/test/payment/swap-any-to-erc20.test.ts +++ b/packages/payment-processor/test/payment/swap-any-to-erc20.test.ts @@ -8,12 +8,12 @@ import { } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import { approveErc20ForSwapWithConversionIfNeeded } from '../../src/payment/swap-conversion-erc20'; +import { approveErc20ForSwapWithConversionIfNeeded } from '../../src/payment/swap-conversion-erc20.js'; import { ERC20, ERC20__factory } from '@requestnetwork/smart-contracts/types'; -import { swapToPayAnyToErc20Request } from '../../src/payment/swap-any-to-erc20'; -import { IConversionSettings } from '../../src/payment/settings'; +import { swapToPayAnyToErc20Request } from '../../src/payment/swap-any-to-erc20.js'; +import { IConversionSettings } from '../../src/payment/settings.js'; -import { currencyManager } from './shared'; +import { currencyManager } from './shared.js'; import { UnsupportedCurrencyError } from '@requestnetwork/currency'; /* eslint-disable no-magic-numbers */ diff --git a/packages/payment-processor/test/payment/swap-erc20-fee-proxy.test.ts b/packages/payment-processor/test/payment/swap-erc20-fee-proxy.test.ts index 5bd0b1f3a5..195e7541e7 100644 --- a/packages/payment-processor/test/payment/swap-erc20-fee-proxy.test.ts +++ b/packages/payment-processor/test/payment/swap-erc20-fee-proxy.test.ts @@ -14,10 +14,10 @@ import { getErc20Balance, ISwapSettings, swapErc20FeeProxyRequest, -} from '../../src'; +} from '../../src/index.js'; import { ERC20__factory } from '@requestnetwork/smart-contracts/types'; import { erc20SwapToPayArtifact } from '@requestnetwork/smart-contracts'; -import { revokeErc20Approval } from '../../src/payment/utils'; +import { revokeErc20Approval } from '../../src/payment/utils.js'; /* eslint-disable no-magic-numbers */ /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/payment-processor/test/payment/utils.test.ts b/packages/payment-processor/test/payment/utils.test.ts index 90ac9ae081..36b4666d1e 100644 --- a/packages/payment-processor/test/payment/utils.test.ts +++ b/packages/payment-processor/test/payment/utils.test.ts @@ -5,7 +5,7 @@ import { getNetworkProvider, getProvider, getSigner, -} from '../../src/payment/utils'; +} from '../../src/payment/utils.js'; describe('getAmountToPay', () => { it('returns the expectedAmount if balance is 0', () => { diff --git a/packages/request-client.js/package.json b/packages/request-client.js/package.json index 04ed4e4c3a..228003b643 100644 --- a/packages/request-client.js/package.json +++ b/packages/request-client.js/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/request-client.js", "version": "0.41.0", + "type": "module", "publishConfig": { "access": "public" }, @@ -31,7 +32,7 @@ "dist" ], "scripts": { - "build": "run-s build:commonjs build:umd", + "build": "run-s build:commonjs", "build:commonjs": "tsc -b tsconfig.build.json", "build:umd": "webpack", "clean": "shx rm -rf dist tsconfig.tsbuildinfo tsconfig.build.tsbuildinfo", @@ -55,7 +56,7 @@ "@requestnetwork/transaction-manager": "0.28.0", "@requestnetwork/types": "0.37.0", "@requestnetwork/utils": "0.37.0", - "axios": "0.27.2", + "axios": "1.5.1", "ethers": "5.5.1", "tslib": "2.5.0" }, diff --git a/packages/request-client.js/src/api/request-network.ts b/packages/request-client.js/src/api/request-network.ts index 602ec54e52..192d9c1f21 100644 --- a/packages/request-client.js/src/api/request-network.ts +++ b/packages/request-client.js/src/api/request-network.ts @@ -19,10 +19,10 @@ import { ICurrencyManager, UnsupportedCurrencyError, } from '@requestnetwork/currency'; -import * as Types from '../types'; -import ContentDataExtension from './content-data-extension'; -import Request from './request'; -import localUtils from './utils'; +import * as Types from '../types.js'; +import ContentDataExtension from './content-data-extension.js'; +import Request from './request.js'; +import localUtils from './utils.js'; /** * Entry point of the request-client.js library. Create requests, get requests, manipulate requests. diff --git a/packages/request-client.js/src/api/request.ts b/packages/request-client.js/src/api/request.ts index 841b799fda..e4969d98ba 100644 --- a/packages/request-client.js/src/api/request.ts +++ b/packages/request-client.js/src/api/request.ts @@ -11,9 +11,9 @@ import { RequestLogicTypes, } from '@requestnetwork/types'; import { ICurrencyManager } from '@requestnetwork/currency'; -import * as Types from '../types'; -import ContentDataExtension from './content-data-extension'; -import localUtils from './utils'; +import * as Types from '../types.js'; +import ContentDataExtension from './content-data-extension.js'; +import localUtils from './utils.js'; import { erc20EscrowToPayArtifact } from '@requestnetwork/smart-contracts'; import { deepCopy } from '@requestnetwork/utils'; diff --git a/packages/request-client.js/src/http-data-access.ts b/packages/request-client.js/src/http-data-access.ts index c49ed440c5..beee468afb 100644 --- a/packages/request-client.js/src/http-data-access.ts +++ b/packages/request-client.js/src/http-data-access.ts @@ -2,7 +2,7 @@ import { ClientTypes, DataAccessTypes } from '@requestnetwork/types'; import axios, { AxiosRequestConfig } from 'axios'; import { EventEmitter } from 'events'; -import httpConfigDefaults from './http-config-defaults'; +import httpConfigDefaults from './http-config-defaults.js'; import { normalizeKeccak256Hash, retry } from '@requestnetwork/utils'; // eslint-disable-next-line @typescript-eslint/no-var-requires diff --git a/packages/request-client.js/src/http-metamask-data-access.ts b/packages/request-client.js/src/http-metamask-data-access.ts index bd60090e04..76231ee1b4 100644 --- a/packages/request-client.js/src/http-metamask-data-access.ts +++ b/packages/request-client.js/src/http-metamask-data-access.ts @@ -4,7 +4,7 @@ import { ClientTypes, CurrencyTypes, DataAccessTypes, StorageTypes } from '@requ import axios, { AxiosRequestConfig } from 'axios'; import { ethers } from 'ethers'; import { EventEmitter } from 'events'; -import HttpDataAccess from './http-data-access'; +import HttpDataAccess from './http-data-access.js'; import { retry } from '@requestnetwork/utils'; /** diff --git a/packages/request-client.js/src/http-request-network.ts b/packages/request-client.js/src/http-request-network.ts index e3eade2ce4..8a9604012e 100644 --- a/packages/request-client.js/src/http-request-network.ts +++ b/packages/request-client.js/src/http-request-network.ts @@ -7,10 +7,10 @@ import { } from '@requestnetwork/types'; import { AxiosRequestConfig } from 'axios'; import { PaymentNetworkOptions } from '@requestnetwork/payment-detection'; -import RequestNetwork from './api/request-network'; -import HttpDataAccess from './http-data-access'; -import MockDataAccess from './mock-data-access'; -import MockStorage from './mock-storage'; +import RequestNetwork from './api/request-network.js'; +import HttpDataAccess from './http-data-access.js'; +import MockDataAccess from './mock-data-access.js'; +import MockStorage from './mock-storage.js'; /** * Exposes RequestNetwork module configured to use http-data-access. diff --git a/packages/request-client.js/src/index.ts b/packages/request-client.js/src/index.ts index 3273105601..08fa84caef 100644 --- a/packages/request-client.js/src/index.ts +++ b/packages/request-client.js/src/index.ts @@ -1,11 +1,11 @@ import { PaymentReferenceCalculator } from '@requestnetwork/payment-detection'; -import Request from './api/request'; -import Utils from './api/utils'; -import { default as RequestNetwork } from './http-request-network'; -import { default as RequestNetworkBase } from './api/request-network'; -import { default as HttpMetaMaskDataAccess } from './http-metamask-data-access'; -import * as Types from './types'; +import Request from './api/request.js'; +import Utils from './api/utils.js'; +import { default as RequestNetwork } from './http-request-network.js'; +import { default as RequestNetworkBase } from './api/request-network.js'; +import { default as HttpMetaMaskDataAccess } from './http-metamask-data-access.js'; +import * as Types from './types.js'; export { PaymentReferenceCalculator, diff --git a/packages/request-client.js/test/api/content-data-manager.test.ts b/packages/request-client.js/test/api/content-data-manager.test.ts index 5d8b4f3418..10f1d96394 100644 --- a/packages/request-client.js/test/api/content-data-manager.test.ts +++ b/packages/request-client.js/test/api/content-data-manager.test.ts @@ -1,8 +1,8 @@ import { AdvancedLogicTypes } from '@requestnetwork/types'; -import ContentDataExtension from '../../src/api/content-data-extension'; +import ContentDataExtension from '../../src/api/content-data-extension.js'; -import * as TestData from './data-for-content-data-extension'; +import * as TestData from './data-for-content-data-extension.js'; import { IAdvancedLogicExtensions } from '@requestnetwork/types/src/advanced-logic-types'; const mockAdvancedLogic = { diff --git a/packages/request-client.js/test/api/request-network.test.ts b/packages/request-client.js/test/api/request-network.test.ts index fed1c9dd8f..b61d7d7ed8 100644 --- a/packages/request-client.js/test/api/request-network.test.ts +++ b/packages/request-client.js/test/api/request-network.test.ts @@ -1,11 +1,11 @@ import MultiFormat from '@requestnetwork/multi-format'; import { DataAccessTypes, SignatureTypes, TransactionTypes } from '@requestnetwork/types'; -import RequestNetwork from '../../src/api/request-network'; +import RequestNetwork from '../../src/api/request-network.js'; -import Request from '../../src/api/request'; +import Request from '../../src/api/request.js'; -import * as TestData from '../data-test'; +import * as TestData from '../data-test.js'; import { normalizeKeccak256Hash, sign } from '@requestnetwork/utils'; const mockDataAccess: DataAccessTypes.IDataAccess = { diff --git a/packages/request-client.js/test/api/request.test.ts b/packages/request-client.js/test/api/request.test.ts index 75b1609efd..7357b9382a 100644 --- a/packages/request-client.js/test/api/request.test.ts +++ b/packages/request-client.js/test/api/request.test.ts @@ -8,7 +8,7 @@ import { import { EventEmitter } from 'events'; -import Request from '../../src/api/request'; +import Request from '../../src/api/request.js'; const mockRequestLogic: RequestLogicTypes.IRequestLogic = { async createRequest(): Promise { diff --git a/packages/request-client.js/test/data-test.ts b/packages/request-client.js/test/data-test.ts index 74b625611b..95cada22ed 100644 --- a/packages/request-client.js/test/data-test.ts +++ b/packages/request-client.js/test/data-test.ts @@ -11,7 +11,7 @@ import { import { normalizeKeccak256Hash, sign } from '@requestnetwork/utils'; import AxiosMockAdapter from 'axios-mock-adapter'; import axios from 'axios'; -import { Types } from '../src'; +import { Types } from '../src/index.js'; export const arbitraryTimestamp = 1549953337; diff --git a/packages/request-client.js/test/declarative-payments.test.ts b/packages/request-client.js/test/declarative-payments.test.ts index 11a7f036d0..145c937067 100644 --- a/packages/request-client.js/test/declarative-payments.test.ts +++ b/packages/request-client.js/test/declarative-payments.test.ts @@ -10,15 +10,15 @@ import { import { ethers } from 'ethers'; import AxiosMockAdapter from 'axios-mock-adapter'; -import { RequestNetwork } from '../src/index'; -import * as TestData from './data-test'; +import { RequestNetwork } from '../src/index.js'; +import * as TestData from './data-test.js'; import { PaymentReferenceCalculator, getPaymentReference, getPaymentNetworkExtension, } from '@requestnetwork/payment-detection'; -import { IRequestDataWithEvents } from '../src/types'; +import { IRequestDataWithEvents } from '../src/types.js'; import { CurrencyManager } from '@requestnetwork/currency'; import { sign } from '@requestnetwork/utils'; diff --git a/packages/request-client.js/test/http-data-access.test.ts b/packages/request-client.js/test/http-data-access.test.ts index 05c44e8f7e..0de31ec070 100644 --- a/packages/request-client.js/test/http-data-access.test.ts +++ b/packages/request-client.js/test/http-data-access.test.ts @@ -1,6 +1,6 @@ -import HttpDataAccess from '../src/http-data-access'; +import HttpDataAccess from '../src/http-data-access.js'; import MockAdapter from 'axios-mock-adapter'; -import * as TestData from './data-test'; +import * as TestData from './data-test.js'; let mockAxios: MockAdapter; diff --git a/packages/request-client.js/test/http-metamask-data-access.test.ts b/packages/request-client.js/test/http-metamask-data-access.test.ts index 4d1af45164..f1834ff384 100644 --- a/packages/request-client.js/test/http-metamask-data-access.test.ts +++ b/packages/request-client.js/test/http-metamask-data-access.test.ts @@ -2,7 +2,7 @@ import { DataAccessTypes, TransactionTypes } from '@requestnetwork/types'; import { Block } from '@requestnetwork/data-access'; -import HttpMetamaskDataAccess from '../src/http-metamask-data-access'; +import HttpMetamaskDataAccess from '../src/http-metamask-data-access.js'; // create a block and add the transaction in it let block1: DataAccessTypes.IBlock = Block.pushTransaction( diff --git a/packages/request-client.js/test/http-request-network.test.ts b/packages/request-client.js/test/http-request-network.test.ts index 1a775a8117..c81ed8e748 100644 --- a/packages/request-client.js/test/http-request-network.test.ts +++ b/packages/request-client.js/test/http-request-network.test.ts @@ -1,6 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; -import * as TestData from './data-test'; -import HttpRequestNetwork from '../src/http-request-network'; +import * as TestData from './data-test.js'; +import HttpRequestNetwork from '../src/http-request-network.js'; let mockAxios: MockAdapter; diff --git a/packages/request-client.js/test/index.test.ts b/packages/request-client.js/test/index.test.ts index 643d0913fa..f137f78431 100644 --- a/packages/request-client.js/test/index.test.ts +++ b/packages/request-client.js/test/index.test.ts @@ -13,17 +13,17 @@ import { decrypt, random32Bytes } from '@requestnetwork/utils'; import { BigNumber, ethers } from 'ethers'; import AxiosMockAdapter from 'axios-mock-adapter'; -import { Request, RequestNetwork, RequestNetworkBase } from '../src/index'; -import * as TestData from './data-test'; -import * as TestDataRealBTC from './data-test-real-btc'; +import { Request, RequestNetwork, RequestNetworkBase } from '../src/index.js'; +import * as TestData from './data-test.js'; +import * as TestDataRealBTC from './data-test-real-btc.js'; import { PaymentReferenceCalculator } from '@requestnetwork/payment-detection'; -import EtherscanProviderMock from './etherscan-mock'; -import httpConfigDefaults from '../src/http-config-defaults'; -import { IRequestDataWithEvents } from '../src/types'; -import HttpMetaMaskDataAccess from '../src/http-metamask-data-access'; -import MockDataAccess from '../src/mock-data-access'; -import MockStorage from '../src/mock-storage'; +import EtherscanProviderMock from './etherscan-mock.js'; +import httpConfigDefaults from '../src/http-config-defaults.js'; +import { IRequestDataWithEvents } from '../src/types.js'; +import HttpMetaMaskDataAccess from '../src/http-metamask-data-access.js'; +import MockDataAccess from '../src/mock-data-access.js'; +import MockStorage from '../src/mock-storage.js'; import * as RequestLogic from '@requestnetwork/types/src/request-logic-types'; const packageJson = require('../package.json'); diff --git a/packages/request-client.js/test/mock-storage.test.ts b/packages/request-client.js/test/mock-storage.test.ts index c018d798ba..a02507a34f 100644 --- a/packages/request-client.js/test/mock-storage.test.ts +++ b/packages/request-client.js/test/mock-storage.test.ts @@ -1,6 +1,6 @@ import { StorageTypes } from '@requestnetwork/types'; -import MockStorage from '../src/mock-storage'; +import MockStorage from '../src/mock-storage.js'; describe('mock-storage', () => { it('can append data', async () => { diff --git a/packages/request-logic/package.json b/packages/request-logic/package.json index 07ef636d17..28bbe5c0b2 100644 --- a/packages/request-logic/package.json +++ b/packages/request-logic/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/request-logic", "version": "0.27.0", + "type": "module", "publishConfig": { "access": "public" }, diff --git a/packages/request-logic/specs/example/example.ts b/packages/request-logic/specs/example/example.ts index 69f4915b2f..d8ce856a40 100644 --- a/packages/request-logic/specs/example/example.ts +++ b/packages/request-logic/specs/example/example.ts @@ -7,7 +7,7 @@ import { SignatureTypes, } from '@requestnetwork/types'; -import RequestLogic from '../../src/requestLogicCore'; +import RequestLogic from '../../src/requestLogicCore.js'; import { sign } from '@requestnetwork/utils'; async function foo(): Promise { diff --git a/packages/request-logic/src/action.ts b/packages/request-logic/src/action.ts index bc2ec49b77..da0780962e 100644 --- a/packages/request-logic/src/action.ts +++ b/packages/request-logic/src/action.ts @@ -1,8 +1,8 @@ import MultiFormat from '@requestnetwork/multi-format'; import { IdentityTypes, RequestLogicTypes, SignatureProviderTypes } from '@requestnetwork/types'; import * as Semver from 'semver'; -import Role from './role'; -import Version from './version'; +import Role from './role.js'; +import Version from './version.js'; import { normalizeKeccak256Hash, recoverSigner } from '@requestnetwork/utils'; /** diff --git a/packages/request-logic/src/actions/accept.ts b/packages/request-logic/src/actions/accept.ts index 712ad73206..8aeb66f4ba 100644 --- a/packages/request-logic/src/actions/accept.ts +++ b/packages/request-logic/src/actions/accept.ts @@ -1,8 +1,8 @@ import { IdentityTypes, RequestLogicTypes, SignatureProviderTypes } from '@requestnetwork/types'; -import Action from '../action'; -import Request from '../request'; -import Version from '../version'; +import Action from '../action.js'; +import Request from '../request.js'; +import Version from '../version.js'; import { deepCopy } from '@requestnetwork/utils'; /** diff --git a/packages/request-logic/src/actions/addExtensionsData.ts b/packages/request-logic/src/actions/addExtensionsData.ts index 9fd3034ad5..c2bc3d5d9c 100644 --- a/packages/request-logic/src/actions/addExtensionsData.ts +++ b/packages/request-logic/src/actions/addExtensionsData.ts @@ -1,8 +1,8 @@ import { IdentityTypes, RequestLogicTypes, SignatureProviderTypes } from '@requestnetwork/types'; -import Action from '../action'; -import Request from '../request'; -import Version from '../version'; +import Action from '../action.js'; +import Request from '../request.js'; +import Version from '../version.js'; import { deepCopy } from '@requestnetwork/utils'; /** diff --git a/packages/request-logic/src/actions/addStakeholders.ts b/packages/request-logic/src/actions/addStakeholders.ts index 6be070f2ee..5596f0fab0 100644 --- a/packages/request-logic/src/actions/addStakeholders.ts +++ b/packages/request-logic/src/actions/addStakeholders.ts @@ -1,9 +1,9 @@ import { IdentityTypes, RequestLogicTypes, SignatureProviderTypes } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import Action from '../action'; -import Request from '../request'; -import Version from '../version'; +import Action from '../action.js'; +import Request from '../request.js'; +import Version from '../version.js'; /** * Implementation of the action add stakeholder from request logic specification diff --git a/packages/request-logic/src/actions/cancel.ts b/packages/request-logic/src/actions/cancel.ts index b09816a3b3..281708c2fb 100644 --- a/packages/request-logic/src/actions/cancel.ts +++ b/packages/request-logic/src/actions/cancel.ts @@ -1,8 +1,8 @@ import { IdentityTypes, RequestLogicTypes, SignatureProviderTypes } from '@requestnetwork/types'; -import Action from '../action'; -import Request from '../request'; -import Version from '../version'; +import Action from '../action.js'; +import Request from '../request.js'; +import Version from '../version.js'; import { deepCopy } from '@requestnetwork/utils'; /** diff --git a/packages/request-logic/src/actions/create.ts b/packages/request-logic/src/actions/create.ts index c6c24ca7b6..120775c84f 100644 --- a/packages/request-logic/src/actions/create.ts +++ b/packages/request-logic/src/actions/create.ts @@ -1,7 +1,7 @@ import { IdentityTypes, RequestLogicTypes, SignatureProviderTypes } from '@requestnetwork/types'; import * as Semver from 'semver'; -import Action from '../action'; -import Version from '../version'; +import Action from '../action.js'; +import Version from '../version.js'; import { deepCopy, getCurrentTimestampInSecond, diff --git a/packages/request-logic/src/actions/increaseExpectedAmount.ts b/packages/request-logic/src/actions/increaseExpectedAmount.ts index f273b092d2..df70f9c5b7 100644 --- a/packages/request-logic/src/actions/increaseExpectedAmount.ts +++ b/packages/request-logic/src/actions/increaseExpectedAmount.ts @@ -1,8 +1,8 @@ import { IdentityTypes, RequestLogicTypes, SignatureProviderTypes } from '@requestnetwork/types'; -import Action from '../action'; -import Request from '../request'; -import Version from '../version'; +import Action from '../action.js'; +import Request from '../request.js'; +import Version from '../version.js'; import { addAmount, deepCopy, isValidAmount } from '@requestnetwork/utils'; /** diff --git a/packages/request-logic/src/actions/reduceExpectedAmount.ts b/packages/request-logic/src/actions/reduceExpectedAmount.ts index dfc0485a6e..899f861dea 100644 --- a/packages/request-logic/src/actions/reduceExpectedAmount.ts +++ b/packages/request-logic/src/actions/reduceExpectedAmount.ts @@ -1,8 +1,8 @@ import { IdentityTypes, RequestLogicTypes, SignatureProviderTypes } from '@requestnetwork/types'; -import Action from '../action'; -import Request from '../request'; -import Version from '../version'; +import Action from '../action.js'; +import Request from '../request.js'; +import Version from '../version.js'; import { deepCopy, isValidAmount, reduceAmount } from '@requestnetwork/utils'; /** diff --git a/packages/request-logic/src/index.ts b/packages/request-logic/src/index.ts index 422ab14429..fc459f6268 100644 --- a/packages/request-logic/src/index.ts +++ b/packages/request-logic/src/index.ts @@ -1 +1 @@ -export { default as RequestLogic } from './request-logic'; +export { default as RequestLogic } from './request-logic.js'; diff --git a/packages/request-logic/src/request-logic.ts b/packages/request-logic/src/request-logic.ts index a3736d3ff3..e7f98a9c52 100644 --- a/packages/request-logic/src/request-logic.ts +++ b/packages/request-logic/src/request-logic.ts @@ -9,7 +9,7 @@ import { SignatureProviderTypes, TransactionTypes, } from '@requestnetwork/types'; -import RequestLogicCore from './requestLogicCore'; +import RequestLogicCore from './requestLogicCore.js'; import { normalizeKeccak256Hash, notNull, uniqueByProperty } from '@requestnetwork/utils'; /** diff --git a/packages/request-logic/src/request.ts b/packages/request-logic/src/request.ts index 04b8720e67..ce054dd825 100644 --- a/packages/request-logic/src/request.ts +++ b/packages/request-logic/src/request.ts @@ -1,6 +1,6 @@ import { IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; -import Role from './role'; +import Role from './role.js'; import { isValidAmount } from '@requestnetwork/utils'; /** diff --git a/packages/request-logic/src/requestLogicCore.ts b/packages/request-logic/src/requestLogicCore.ts index ca04cdea0f..9280f55306 100644 --- a/packages/request-logic/src/requestLogicCore.ts +++ b/packages/request-logic/src/requestLogicCore.ts @@ -1,14 +1,14 @@ import { AdvancedLogicTypes, RequestLogicTypes } from '@requestnetwork/types'; -import Action from './action'; -import Request from './request'; - -import AcceptAction from './actions/accept'; -import AddExtensionsData from './actions/addExtensionsData'; -import CancelAction from './actions/cancel'; -import CreateAction from './actions/create'; -import IncreaseExpectedAmountAction from './actions/increaseExpectedAmount'; -import ReduceExpectedAmountAction from './actions/reduceExpectedAmount'; -import AddStakeholdersAction from './actions/addStakeholders'; +import Action from './action.js'; +import Request from './request.js'; + +import AcceptAction from './actions/accept.js'; +import AddExtensionsData from './actions/addExtensionsData.js'; +import CancelAction from './actions/cancel.js'; +import CreateAction from './actions/create.js'; +import IncreaseExpectedAmountAction from './actions/increaseExpectedAmount.js'; +import ReduceExpectedAmountAction from './actions/reduceExpectedAmount.js'; +import AddStakeholdersAction from './actions/addStakeholders.js'; import { deepCopy } from '@requestnetwork/utils'; /** diff --git a/packages/request-logic/src/version.ts b/packages/request-logic/src/version.ts index e1be2766ef..78191d6855 100644 --- a/packages/request-logic/src/version.ts +++ b/packages/request-logic/src/version.ts @@ -1,6 +1,6 @@ import { RequestLogicTypes } from '@requestnetwork/types'; import * as Semver from 'semver'; -import Config from './config'; +import Config from './config.js'; /** * Function to manage Request versions specification supported by this implementation diff --git a/packages/request-logic/test/index.test.ts b/packages/request-logic/test/index.test.ts index b82c42278f..39a6ca0960 100644 --- a/packages/request-logic/test/index.test.ts +++ b/packages/request-logic/test/index.test.ts @@ -3,10 +3,10 @@ import { EventEmitter } from 'events'; import MultiFormat from '@requestnetwork/multi-format'; import { AdvancedLogicTypes, RequestLogicTypes, TransactionTypes } from '@requestnetwork/types'; -import { RequestLogic } from '../src/index'; -import * as TestData from './unit/utils/test-data-generator'; +import { RequestLogic } from '../src/index.js'; +import * as TestData from './unit/utils/test-data-generator.js'; -import Version from '../src/version'; +import Version from '../src/version.js'; import { normalizeKeccak256Hash, sign } from '@requestnetwork/utils'; const CURRENT_VERSION = Version.currentVersion; diff --git a/packages/request-logic/test/unit/action.test.ts b/packages/request-logic/test/unit/action.test.ts index a308739dbf..d4de9bbcc7 100644 --- a/packages/request-logic/test/unit/action.test.ts +++ b/packages/request-logic/test/unit/action.test.ts @@ -7,12 +7,12 @@ import { } from '@requestnetwork/types'; import { deepCopy, normalizeKeccak256Hash } from '@requestnetwork/utils'; -import Action from '../../src/action'; -import CreateAction from '../../src/actions/create'; -import Version from '../../src/version'; +import Action from '../../src/action.js'; +import CreateAction from '../../src/actions/create.js'; +import Version from '../../src/version.js'; const CURRENT_VERSION = Version.currentVersion; -import * as TestData from './utils/test-data-generator'; +import * as TestData from './utils/test-data-generator.js'; const randomUnsignedAction = { name: RequestLogicTypes.ACTION_NAME.CREATE, diff --git a/packages/request-logic/test/unit/actions/accept.test.ts b/packages/request-logic/test/unit/actions/accept.test.ts index 2f7b3d1726..3abff5946e 100644 --- a/packages/request-logic/test/unit/actions/accept.test.ts +++ b/packages/request-logic/test/unit/actions/accept.test.ts @@ -1,11 +1,11 @@ import { IdentityTypes, RequestLogicTypes, SignatureTypes } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import AcceptAction from '../../../src/actions/accept'; +import AcceptAction from '../../../src/actions/accept.js'; -import Version from '../../../src/version'; +import Version from '../../../src/version.js'; const CURRENT_VERSION = Version.currentVersion; -import * as TestData from '../utils/test-data-generator'; +import * as TestData from '../utils/test-data-generator.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ describe('actions/accept', () => { diff --git a/packages/request-logic/test/unit/actions/addExtensionsData.test.ts b/packages/request-logic/test/unit/actions/addExtensionsData.test.ts index 95b769f839..253d01e63a 100644 --- a/packages/request-logic/test/unit/actions/addExtensionsData.test.ts +++ b/packages/request-logic/test/unit/actions/addExtensionsData.test.ts @@ -1,11 +1,11 @@ import { IdentityTypes, RequestLogicTypes, SignatureTypes } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import AddExtensionsDataAction from '../../../src/actions/addExtensionsData'; +import AddExtensionsDataAction from '../../../src/actions/addExtensionsData.js'; -import Version from '../../../src/version'; +import Version from '../../../src/version.js'; const CURRENT_VERSION = Version.currentVersion; -import * as TestData from '../utils/test-data-generator'; +import * as TestData from '../utils/test-data-generator.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ describe('actions/addExtensionsData', () => { diff --git a/packages/request-logic/test/unit/actions/cancel.test.ts b/packages/request-logic/test/unit/actions/cancel.test.ts index 580be2f782..50531d6a8c 100644 --- a/packages/request-logic/test/unit/actions/cancel.test.ts +++ b/packages/request-logic/test/unit/actions/cancel.test.ts @@ -1,11 +1,11 @@ import { IdentityTypes, RequestLogicTypes, SignatureTypes } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import CancelAction from '../../../src/actions/cancel'; +import CancelAction from '../../../src/actions/cancel.js'; -import Version from '../../../src/version'; +import Version from '../../../src/version.js'; const CURRENT_VERSION = Version.currentVersion; -import * as TestData from '../utils/test-data-generator'; +import * as TestData from '../utils/test-data-generator.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ describe('actions/cancel', () => { diff --git a/packages/request-logic/test/unit/actions/create.test.ts b/packages/request-logic/test/unit/actions/create.test.ts index bfcd3fcdf4..69881ecb45 100644 --- a/packages/request-logic/test/unit/actions/create.test.ts +++ b/packages/request-logic/test/unit/actions/create.test.ts @@ -3,12 +3,12 @@ import { IdentityTypes, RequestLogicTypes } from '@requestnetwork/types'; import { normalizeKeccak256Hash } from '@requestnetwork/utils'; -import CreateAction from '../../../src/actions/create'; +import CreateAction from '../../../src/actions/create.js'; -import Version from '../../../src/version'; +import Version from '../../../src/version.js'; const CURRENT_VERSION = Version.currentVersion; -import * as TestData from '../utils/test-data-generator'; +import * as TestData from '../utils/test-data-generator.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ describe('CreateAction', () => { diff --git a/packages/request-logic/test/unit/actions/increaseExpectedAmount.test.ts b/packages/request-logic/test/unit/actions/increaseExpectedAmount.test.ts index f9166d9ab9..78af1d9d75 100644 --- a/packages/request-logic/test/unit/actions/increaseExpectedAmount.test.ts +++ b/packages/request-logic/test/unit/actions/increaseExpectedAmount.test.ts @@ -1,11 +1,11 @@ import { IdentityTypes, RequestLogicTypes, SignatureTypes } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import IncreaseExpectedAmountAction from '../../../src/actions/increaseExpectedAmount'; +import IncreaseExpectedAmountAction from '../../../src/actions/increaseExpectedAmount.js'; -import Version from '../../../src/version'; +import Version from '../../../src/version.js'; const CURRENT_VERSION = Version.currentVersion; -import * as TestData from '../utils/test-data-generator'; +import * as TestData from '../utils/test-data-generator.js'; const requestIdMock = '011c2610cbc5bee43b6bc9800e69ec832fb7d50ea098a88877a0afdcac5981d3f8'; diff --git a/packages/request-logic/test/unit/actions/reduceExpectedAmount.test.ts b/packages/request-logic/test/unit/actions/reduceExpectedAmount.test.ts index 190e3aeb5c..c7c42422dd 100644 --- a/packages/request-logic/test/unit/actions/reduceExpectedAmount.test.ts +++ b/packages/request-logic/test/unit/actions/reduceExpectedAmount.test.ts @@ -1,11 +1,11 @@ import { IdentityTypes, RequestLogicTypes, SignatureTypes } from '@requestnetwork/types'; import { deepCopy } from '@requestnetwork/utils'; -import ReduceExpectedAmountAction from '../../../src/actions/reduceExpectedAmount'; +import ReduceExpectedAmountAction from '../../../src/actions/reduceExpectedAmount.js'; -import Version from '../../../src/version'; +import Version from '../../../src/version.js'; const CURRENT_VERSION = Version.currentVersion; -import * as TestData from '../utils/test-data-generator'; +import * as TestData from '../utils/test-data-generator.js'; const requestIdMock = '011c2610cbc5bee43b6bc9800e69ec832fb7d50ea098a88877a0afdcac5981d3f8'; diff --git a/packages/request-logic/test/unit/request.test.ts b/packages/request-logic/test/unit/request.test.ts index 0e910fec06..8fd20e99e5 100644 --- a/packages/request-logic/test/unit/request.test.ts +++ b/packages/request-logic/test/unit/request.test.ts @@ -1,9 +1,9 @@ import { RequestLogicTypes } from '@requestnetwork/types'; -import Request from '../../src/request'; -import * as TestData from './utils/test-data-generator'; +import Request from '../../src/request.js'; +import * as TestData from './utils/test-data-generator.js'; -import Version from '../../src/version'; +import Version from '../../src/version.js'; const CURRENT_VERSION = Version.currentVersion; /* eslint-disable @typescript-eslint/no-unused-expressions */ diff --git a/packages/request-logic/test/unit/requestLogicCore.test.ts b/packages/request-logic/test/unit/requestLogicCore.test.ts index 3728b27daf..6bae03f18f 100644 --- a/packages/request-logic/test/unit/requestLogicCore.test.ts +++ b/packages/request-logic/test/unit/requestLogicCore.test.ts @@ -8,12 +8,12 @@ import { } from '@requestnetwork/types'; import { deepCopy, normalizeKeccak256Hash } from '@requestnetwork/utils'; -import Version from '../../src/version'; +import Version from '../../src/version.js'; const CURRENT_VERSION = Version.currentVersion; -import * as TestData from './utils/test-data-generator'; +import * as TestData from './utils/test-data-generator.js'; -import RequestLogicCore from '../../src/requestLogicCore'; +import RequestLogicCore from '../../src/requestLogicCore.js'; const fakeAdvancedLogic = { applyActionToExtensions: ( diff --git a/packages/request-logic/test/unit/role.test.ts b/packages/request-logic/test/unit/role.test.ts index 9b3d67ffe8..343a23a8a0 100644 --- a/packages/request-logic/test/unit/role.test.ts +++ b/packages/request-logic/test/unit/role.test.ts @@ -1,7 +1,7 @@ import { RequestLogicTypes } from '@requestnetwork/types'; -import Role from '../../src/role'; +import Role from '../../src/role.js'; -import * as TestData from './utils/test-data-generator'; +import * as TestData from './utils/test-data-generator.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ describe('Role', () => { diff --git a/packages/request-logic/test/unit/utils/test-data-generator.ts b/packages/request-logic/test/unit/utils/test-data-generator.ts index 25a107eb20..b09f3ba19f 100644 --- a/packages/request-logic/test/unit/utils/test-data-generator.ts +++ b/packages/request-logic/test/unit/utils/test-data-generator.ts @@ -7,7 +7,7 @@ import { } from '@requestnetwork/types'; import { sign } from '@requestnetwork/utils'; -import Version from '../../../src/version'; +import Version from '../../../src/version.js'; const CURRENT_VERSION = Version.currentVersion; // payee id diff --git a/packages/request-logic/test/unit/version.test.ts b/packages/request-logic/test/unit/version.test.ts index 1396ce8059..ab9610c8f0 100644 --- a/packages/request-logic/test/unit/version.test.ts +++ b/packages/request-logic/test/unit/version.test.ts @@ -1,5 +1,5 @@ -import Config from '../../src/config'; -import Version from '../../src/version'; +import Config from '../../src/config.js'; +import Version from '../../src/version.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ describe('version', () => { diff --git a/packages/request-node/package.json b/packages/request-node/package.json index 68e880a19f..4836d125a5 100644 --- a/packages/request-node/package.json +++ b/packages/request-node/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/request-node", "version": "0.28.0", + "type": "module", "publishConfig": { "access": "public" }, diff --git a/packages/request-node/src/config.ts b/packages/request-node/src/config.ts index 27a660104e..2301a8bfa0 100644 --- a/packages/request-node/src/config.ts +++ b/packages/request-node/src/config.ts @@ -1,6 +1,6 @@ import { LogTypes, StorageTypes } from '@requestnetwork/types'; import * as yargs from 'yargs'; -import { LogMode } from './logger'; +import { LogMode } from './logger.js'; import { config } from 'dotenv'; import { BigNumber } from 'ethers'; diff --git a/packages/request-node/src/request/getConfirmedTransactionHandler.ts b/packages/request-node/src/request/getConfirmedTransactionHandler.ts index 879f733174..c6ea874d77 100644 --- a/packages/request-node/src/request/getConfirmedTransactionHandler.ts +++ b/packages/request-node/src/request/getConfirmedTransactionHandler.ts @@ -1,7 +1,7 @@ import { LogTypes } from '@requestnetwork/types'; import { Request, Response } from 'express'; import { StatusCodes } from 'http-status-codes'; -import ConfirmedTransactionStore from './confirmedTransactionStore'; +import ConfirmedTransactionStore from './confirmedTransactionStore.js'; export default class getConfirmedTransactionHandler { constructor(private logger: LogTypes.ILogger, private store: ConfirmedTransactionStore) { diff --git a/packages/request-node/src/request/getStatus.ts b/packages/request-node/src/request/getStatus.ts index 3fe5074bea..693ea04314 100644 --- a/packages/request-node/src/request/getStatus.ts +++ b/packages/request-node/src/request/getStatus.ts @@ -1,7 +1,7 @@ import { DataAccessTypes, LogTypes } from '@requestnetwork/types'; import { Request, Response } from 'express'; import { StatusCodes } from 'http-status-codes'; -import * as config from '../config'; +import * as config from '../config.js'; // eslint-disable-next-line @typescript-eslint/no-var-requires const packageJson = require('../../package.json'); diff --git a/packages/request-node/src/request/ipfsAdd.ts b/packages/request-node/src/request/ipfsAdd.ts index 7fb0d63e34..a7ce9c2220 100644 --- a/packages/request-node/src/request/ipfsAdd.ts +++ b/packages/request-node/src/request/ipfsAdd.ts @@ -3,7 +3,7 @@ import { LogTypes, StorageTypes } from '@requestnetwork/types'; import { Request, Response } from 'express'; import { StatusCodes } from 'http-status-codes'; -import { getPersistTransactionTimeout } from '../config'; +import { getPersistTransactionTimeout } from '../config.js'; /** * Handles ipfsAdd of data-access layer. diff --git a/packages/request-node/src/request/persistTransaction.ts b/packages/request-node/src/request/persistTransaction.ts index 3cb2b63d27..b54a7f856e 100644 --- a/packages/request-node/src/request/persistTransaction.ts +++ b/packages/request-node/src/request/persistTransaction.ts @@ -1,9 +1,9 @@ import { LogTypes, MultiFormatTypes, DataAccessTypes } from '@requestnetwork/types'; import { Request, Response } from 'express'; import { StatusCodes } from 'http-status-codes'; -import { getPersistTransactionTimeout } from '../config'; +import { getPersistTransactionTimeout } from '../config.js'; -import ConfirmedTransactionStore from './confirmedTransactionStore'; +import ConfirmedTransactionStore from './confirmedTransactionStore.js'; import { normalizeKeccak256Hash } from '@requestnetwork/utils'; /** diff --git a/packages/request-node/src/requestNode.ts b/packages/request-node/src/requestNode.ts index 5fcd451841..a3e79e9297 100644 --- a/packages/request-node/src/requestNode.ts +++ b/packages/request-node/src/requestNode.ts @@ -3,10 +3,10 @@ import { LogTypes } from '@requestnetwork/types'; import KeyvFile from 'keyv-file'; -import { getInitializationStorageFilePath, getMnemonic } from './config'; -import { getEthereumStorage, getIpfsStorage } from './storageUtils'; +import { getInitializationStorageFilePath, getMnemonic } from './config.js'; +import { getEthereumStorage, getIpfsStorage } from './storageUtils.js'; -import { RequestNodeBase } from './requestNodeBase'; +import { RequestNodeBase } from './requestNodeBase.js'; import { SimpleLogger } from '@requestnetwork/utils'; export class RequestNode extends RequestNodeBase { diff --git a/packages/request-node/src/requestNodeBase.ts b/packages/request-node/src/requestNodeBase.ts index 81c05c5be4..03e6f88031 100644 --- a/packages/request-node/src/requestNodeBase.ts +++ b/packages/request-node/src/requestNodeBase.ts @@ -5,14 +5,14 @@ import { Server } from 'http'; import express, { NextFunction, Request, Response } from 'express'; import { StatusCodes } from 'http-status-codes'; import { Store } from 'keyv'; -import { getCustomHeaders } from './config'; -import ConfirmedTransactionStore from './request/confirmedTransactionStore'; -import GetConfirmedTransactionHandler from './request/getConfirmedTransactionHandler'; -import GetTransactionsByChannelIdHandler from './request/getTransactionsByChannelId'; -import PersistTransactionHandler from './request/persistTransaction'; -import GetChannelsByTopicHandler from './request/getChannelsByTopic'; -import GetStatusHandler from './request/getStatus'; -import IpfsAddHandler from './request/ipfsAdd'; +import { getCustomHeaders } from './config.js'; +import ConfirmedTransactionStore from './request/confirmedTransactionStore.js'; +import GetConfirmedTransactionHandler from './request/getConfirmedTransactionHandler.js'; +import GetTransactionsByChannelIdHandler from './request/getTransactionsByChannelId.js'; +import PersistTransactionHandler from './request/persistTransaction.js'; +import GetChannelsByTopicHandler from './request/getChannelsByTopic.js'; +import GetStatusHandler from './request/getStatus.js'; +import IpfsAddHandler from './request/ipfsAdd.js'; // eslint-disable-next-line @typescript-eslint/no-var-requires const packageJson = require('../package.json'); diff --git a/packages/request-node/src/server.ts b/packages/request-node/src/server.ts index 7d9a7a4cef..8ae7ff79a4 100755 --- a/packages/request-node/src/server.ts +++ b/packages/request-node/src/server.ts @@ -1,11 +1,11 @@ #!/usr/bin/env node import * as yargs from 'yargs'; import { LogTypes } from '@requestnetwork/types'; -import * as config from './config'; -import { Logger } from './logger'; -import { RequestNode } from './requestNode'; +import * as config from './config.js'; +import { Logger } from './logger.js'; +import { RequestNode } from './requestNode.js'; import withShutdown from 'http-shutdown'; -import { TheGraphRequestNode } from './thegraph-node'; +import { TheGraphRequestNode } from './thegraph-node.js'; const argv = yargs.parseSync(); diff --git a/packages/request-node/src/storageUtils.ts b/packages/request-node/src/storageUtils.ts index f06a95cbf1..e49c2cc974 100644 --- a/packages/request-node/src/storageUtils.ts +++ b/packages/request-node/src/storageUtils.ts @@ -1,6 +1,6 @@ import { EthereumStorage, IpfsStorage } from '@requestnetwork/ethereum-storage'; import { LogTypes, StorageTypes } from '@requestnetwork/types'; -import * as config from './config'; +import * as config from './config.js'; import Keyv from 'keyv'; import KeyvFile from 'keyv-file'; diff --git a/packages/request-node/src/thegraph-node.ts b/packages/request-node/src/thegraph-node.ts index 55be709ce4..b4a1a81af2 100644 --- a/packages/request-node/src/thegraph-node.ts +++ b/packages/request-node/src/thegraph-node.ts @@ -3,9 +3,9 @@ import { providers, Wallet } from 'ethers'; import { NonceManager } from '@ethersproject/experimental'; import { LogTypes } from '@requestnetwork/types'; -import { RequestNodeBase } from './requestNodeBase'; -import * as config from './config'; -import { getIpfsStorage } from './storageUtils'; +import { RequestNodeBase } from './requestNodeBase.js'; +import * as config from './config.js'; +import { getIpfsStorage } from './storageUtils.js'; import { TheGraphDataAccess } from '@requestnetwork/thegraph-data-access'; import { EthereumStorageEthers, diff --git a/packages/request-node/test/getChannelsByTopic.test.ts b/packages/request-node/test/getChannelsByTopic.test.ts index 4528dacfed..193f29eecb 100644 --- a/packages/request-node/test/getChannelsByTopic.test.ts +++ b/packages/request-node/test/getChannelsByTopic.test.ts @@ -1,7 +1,7 @@ import { StatusCodes } from 'http-status-codes'; import request from 'supertest'; -import { RequestNode } from '../src/requestNode'; -import { RequestNodeBase } from '../src/requestNodeBase'; +import { RequestNode } from '../src/requestNode.js'; +import { RequestNodeBase } from '../src/requestNodeBase.js'; const channelId = '01aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'; const anotherChannelId = '01bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'; diff --git a/packages/request-node/test/getConfirmedTransaction.test.ts b/packages/request-node/test/getConfirmedTransaction.test.ts index 4cd49ecd5b..05d2805962 100644 --- a/packages/request-node/test/getConfirmedTransaction.test.ts +++ b/packages/request-node/test/getConfirmedTransaction.test.ts @@ -1,8 +1,8 @@ import { normalizeKeccak256Hash } from '@requestnetwork/utils'; import { StatusCodes } from 'http-status-codes'; import request from 'supertest'; -import { RequestNode } from '../src/requestNode'; -import { RequestNodeBase } from '../src/requestNodeBase'; +import { RequestNode } from '../src/requestNode.js'; +import { RequestNodeBase } from '../src/requestNodeBase.js'; const channelId = '010aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'; diff --git a/packages/request-node/test/getTransactionsByChannelId.test.ts b/packages/request-node/test/getTransactionsByChannelId.test.ts index 9c9dd1a314..b8ac2fd8bc 100644 --- a/packages/request-node/test/getTransactionsByChannelId.test.ts +++ b/packages/request-node/test/getTransactionsByChannelId.test.ts @@ -1,7 +1,7 @@ import { StatusCodes } from 'http-status-codes'; import request from 'supertest'; -import { RequestNode } from '../src/requestNode'; -import { RequestNodeBase } from '../src/requestNodeBase'; +import { RequestNode } from '../src/requestNode.js'; +import { RequestNodeBase } from '../src/requestNodeBase.js'; const channelId = '01aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab'; const anotherChannelId = '01bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc'; diff --git a/packages/request-node/test/ipfsAdd.test.ts b/packages/request-node/test/ipfsAdd.test.ts index b3badddda6..2a3d3a73bf 100644 --- a/packages/request-node/test/ipfsAdd.test.ts +++ b/packages/request-node/test/ipfsAdd.test.ts @@ -1,7 +1,7 @@ import { StatusCodes } from 'http-status-codes'; import request from 'supertest'; -import { RequestNode } from '../src/requestNode'; -import { RequestNodeBase } from '../src/requestNodeBase'; +import { RequestNode } from '../src/requestNode.js'; +import { RequestNodeBase } from '../src/requestNodeBase.js'; let requestNodeInstance: RequestNodeBase; let server: any; diff --git a/packages/request-node/test/persistTransaction.test.ts b/packages/request-node/test/persistTransaction.test.ts index 2f0db9196b..c6b6ac9095 100644 --- a/packages/request-node/test/persistTransaction.test.ts +++ b/packages/request-node/test/persistTransaction.test.ts @@ -1,7 +1,7 @@ import { StatusCodes } from 'http-status-codes'; import request from 'supertest'; -import { RequestNode } from '../src/requestNode'; -import { RequestNodeBase } from '../src/requestNodeBase'; +import { RequestNode } from '../src/requestNode.js'; +import { RequestNodeBase } from '../src/requestNodeBase.js'; const channelId = '010aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'; const anotherChannelId = '010bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'; diff --git a/packages/request-node/test/requestNode.test.ts b/packages/request-node/test/requestNode.test.ts index 3856d69f0d..64c9982508 100644 --- a/packages/request-node/test/requestNode.test.ts +++ b/packages/request-node/test/requestNode.test.ts @@ -1,7 +1,7 @@ import { StatusCodes } from 'http-status-codes'; import request from 'supertest'; -import { RequestNode } from '../src/requestNode'; -import { RequestNodeBase } from '../src/requestNodeBase'; +import { RequestNode } from '../src/requestNode.js'; +import { RequestNodeBase } from '../src/requestNodeBase.js'; const packageJson = require('../package.json'); const requestNodeVersion = packageJson.version; diff --git a/packages/request-node/test/thegraph/persistTransaction.test.ts b/packages/request-node/test/thegraph/persistTransaction.test.ts index 8df2ce7f6b..fa0b79071c 100644 --- a/packages/request-node/test/thegraph/persistTransaction.test.ts +++ b/packages/request-node/test/thegraph/persistTransaction.test.ts @@ -2,8 +2,8 @@ import { StatusCodes } from 'http-status-codes'; import request from 'supertest'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import { RequestNodeBase } from '../../src/requestNodeBase'; -import { TheGraphRequestNode } from '../../src/thegraph-node'; +import { RequestNodeBase } from '../../src/requestNodeBase.js'; +import { TheGraphRequestNode } from '../../src/thegraph-node.js'; import * as core from 'express-serve-static-core'; const subgraphUrl = 'http://localhost:8000/subgraphs/name/RequestNetwork/request-storage'; diff --git a/packages/smart-contracts/hardhat.config.ts b/packages/smart-contracts/hardhat.config.ts index f9cf5d0ea0..053dba621a 100644 --- a/packages/smart-contracts/hardhat.config.ts +++ b/packages/smart-contracts/hardhat.config.ts @@ -13,7 +13,6 @@ import { computeCreate2DeploymentAddressesFromList } from './scripts-create2/com import { VerifyCreate2FromList } from './scripts-create2/verify'; import { deployWithCreate2FromList } from './scripts-create2/deploy'; import { NUMBER_ERRORS } from './scripts/utils'; -import { networkRpcs } from '@requestnetwork/utils'; import { tenderlyImportAll } from './scripts-create2/tenderly'; import { updateContractsFromList } from './scripts-create2/update-contracts-setup'; @@ -46,7 +45,26 @@ const requestDeployer = process.env.REQUEST_DEPLOYER_LIVE ? LIVE_DEPLOYER_ADDRESS : LOCAL_DEPLOYER_ADDRESS; -const url = (network: string): string => process.env.WEB3_PROVIDER_URL || networkRpcs[network]; +/** + * Define default URLs for networks supported by Request payment detection but not by ethers' Infura Provider + */ +const networkRpcs: Record = { + matic: 'https://polygon-rpc.com/', + fantom: 'https://rpc.ftm.tools', + fuse: 'https://rpc.fuse.io', + bsctest: 'https://data-seed-prebsc-1-s1.binance.org:8545', + bsc: 'https://bsc-dataseed1.binance.org/', + xdai: 'https://rpc.ankr.com/gnosis', + celo: 'https://forno.celo.org', + 'arbitrum-rinkeby': 'https://rinkeby.arbitrum.io/rpc', + 'arbitrum-one': 'https://arb1.arbitrum.io/rpc', + avalanche: 'https://api.avax.network/ext/bc/C/rpc', + optimism: 'https://mainnet.optimism.io', + moonbeam: 'https://moonbeam.public.blastapi.io', + tombchain: 'https://rpc.tombchain.com/', + mantle: 'https://rpc.mantle.xyz/', + 'mantle-testnet': 'https://rpc.testnet.mantle.xyz/', +}; export default { solidity: '0.8.9', @@ -82,77 +100,77 @@ export default { accounts, }, matic: { - url: url('matic'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['matic'], chainId: 137, accounts, }, celo: { - url: url('celo'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['celo'], chainId: 42220, accounts, }, bsctest: { - url: url('bsctest'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['bsctest'], chainId: 97, accounts, }, bsc: { - url: url('bsc'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['bsc'], chainId: 56, accounts, }, xdai: { - url: url('xdai'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['xdai'], chainId: 100, accounts, }, fuse: { - url: url('fuse'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['fuse'], chainId: 122, accounts, }, fantom: { - url: url('fantom'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['fantom'], chainId: 250, accounts, }, 'arbitrum-one': { - url: url('arbitrum-one'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['arbitrum-one'], chainId: 42161, accounts, }, 'arbitrum-rinkeby': { - url: url('arbitrum-rinkeby'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['arbitrum-rinkeby'], chainId: 421611, accounts, }, avalanche: { - url: url('avalanche'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['avalanche'], chainId: 43114, accounts, }, optimism: { - url: url('optimism'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['optimism'], chainId: 10, accounts, }, moonbeam: { - url: url('moonbeam'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['moonbeam'], chainId: 1284, accounts, }, tombchain: { - url: url('tombchain'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['tombchain'], chainId: 6969, accounts, }, mantle: { - url: url('mantle'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['mantle'], chainId: 5000, accounts, }, 'mantle-testnet': { - url: url('mantle-testnet'), + url: process.env.WEB3_PROVIDER_URL || networkRpcs['mantle-testnet'], chainId: 5001, accounts, }, diff --git a/packages/smart-contracts/package.json b/packages/smart-contracts/package.json index c544bba8cc..1af0a2c969 100644 --- a/packages/smart-contracts/package.json +++ b/packages/smart-contracts/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/smart-contracts", "version": "0.30.0", + "type": "commonjs", "publishConfig": { "access": "public" }, @@ -70,9 +71,9 @@ "@types/chai": "4.2.21", "@types/mocha": "8.2.3", "@types/node": "16.11.7", - "axios": "0.27.2", + "axios": "1.5.1", "chai": "4.3.4", - "dotenv": "10.0.0", + "dotenv": "16.3.1", "ethereum-waffle": "3.4.0", "ethers": "5.5.1", "ganache-cli": "6.12.0", diff --git a/packages/smart-contracts/scripts-create2/check-deployer.ts b/packages/smart-contracts/scripts-create2/check-deployer.ts index e1c3c689a1..4a5518c566 100644 --- a/packages/smart-contracts/scripts-create2/check-deployer.ts +++ b/packages/smart-contracts/scripts-create2/check-deployer.ts @@ -1,5 +1,4 @@ import { HardhatRuntimeEnvironmentExtended } from './types'; -import { getCeloProvider, getDefaultProvider } from '@requestnetwork/utils'; export const checkCreate2Deployer = async ( hre: HardhatRuntimeEnvironmentExtended, @@ -13,6 +12,8 @@ export const checkCreate2Deployer = async ( await Promise.all( hre.config.xdeploy.networks.map(async (network: string) => { let provider; + // import ES Module in CommonJS + const { getCeloProvider, getDefaultProvider } = await import('@requestnetwork/utils'); if (network === 'celo') { provider = getCeloProvider(); } else { diff --git a/packages/smart-contracts/scripts-create2/compute-one-address.ts b/packages/smart-contracts/scripts-create2/compute-one-address.ts index 565c987a98..fc0d11bddd 100644 --- a/packages/smart-contracts/scripts-create2/compute-one-address.ts +++ b/packages/smart-contracts/scripts-create2/compute-one-address.ts @@ -2,7 +2,6 @@ import { HardhatRuntimeEnvironmentExtended, IDeploymentParams } from './types'; import { requestDeployer } from '../src/lib'; import { create2ContractDeploymentList } from './utils'; import { getConstructorArgs } from './constructor-args'; -import { EvmChains } from '@requestnetwork/currency'; // Deploys, set up the contracts export async function computeCreate2DeploymentAddress( @@ -48,6 +47,8 @@ export const computeCreate2DeploymentAddressesFromList = async ( hre: HardhatRuntimeEnvironmentExtended, ): Promise => { const chain = hre.network.name; + // import ES Module in CommonJS + const { EvmChains } = await import('@requestnetwork/currency'); EvmChains.assertChainSupported(chain); await Promise.all( create2ContractDeploymentList.map(async (contract) => { diff --git a/packages/smart-contracts/scripts-create2/contract-setup/adminTasks.ts b/packages/smart-contracts/scripts-create2/contract-setup/adminTasks.ts index 82e026b0d3..fd55202e99 100644 --- a/packages/smart-contracts/scripts-create2/contract-setup/adminTasks.ts +++ b/packages/smart-contracts/scripts-create2/contract-setup/adminTasks.ts @@ -4,14 +4,8 @@ import * as artifacts from '../../src/lib'; import { BigNumber, Overrides, Wallet } from 'ethers'; import { HardhatRuntimeEnvironmentExtended } from '../types'; import { parseUnits } from 'ethers/lib/utils'; -import { - isEip1559Supported, - getCeloProvider, - getDefaultProvider, - normalizeGasFees, -} from '@requestnetwork/utils'; -import { CurrencyTypes } from '@requestnetwork/types'; import { suggestFeesEip1559 } from '../fee-suggestion'; +import { EvmChainName } from '../../src/types'; // Swap Fees: set to 5 for 0.5% const REQUEST_SWAP_FEES = 0; @@ -31,7 +25,7 @@ const BATCH_FEE_AMOUNT_USD_LIMIT = parseUnits('150', 8); */ export const updateChainlinkConversionPath = async ( contract: any, - network: CurrencyTypes.EvmChainName, + network: EvmChainName, txOverrides: Overrides, version?: string, ): Promise => { @@ -51,7 +45,7 @@ export const updateChainlinkConversionPath = async ( export const updateSwapRouter = async ( contract: any, - network: string, + network: EvmChainName, txOverrides: Overrides, ): Promise => { const currentSwapRouter = await contract.swapRouter(); @@ -123,7 +117,7 @@ export const updateBatchPaymentFeeAmountUSDLimit = async ( */ export const updatePaymentFeeProxyAddress = async ( contract: any, - network: CurrencyTypes.EvmChainName, + network: EvmChainName, txOverrides: Overrides, proxyType: 'native' | 'erc20', version?: string, @@ -156,7 +150,7 @@ export const updatePaymentFeeProxyAddress = async ( */ export const updateBatchConversionProxy = async ( contract: any, - network: CurrencyTypes.EvmChainName, + network: EvmChainName, txOverrides: Overrides, proxyName: | 'native' @@ -275,6 +269,9 @@ export const getSignerAndGasFees = async ( maxPriorityFeePerGas?: BigNumber; }; }> => { + // import ES Module in CommonJS + const { getCeloProvider, getDefaultProvider, isEip1559Supported, normalizeGasFees } = + await import('@requestnetwork/utils'); let provider; if (network === 'celo') { provider = getCeloProvider(); diff --git a/packages/smart-contracts/scripts-create2/contract-setup/setupBatchConversionPayments.ts b/packages/smart-contracts/scripts-create2/contract-setup/setupBatchConversionPayments.ts index 536b9d55b2..cce321d677 100644 --- a/packages/smart-contracts/scripts-create2/contract-setup/setupBatchConversionPayments.ts +++ b/packages/smart-contracts/scripts-create2/contract-setup/setupBatchConversionPayments.ts @@ -7,8 +7,7 @@ import { updateBatchPaymentFees, updateNativeAndUSDAddress, } from './adminTasks'; -import { CurrencyManager, EvmChains } from '@requestnetwork/currency'; -import { CurrencyTypes, RequestLogicTypes } from '@requestnetwork/types'; +import { EvmChainName } from '../../src/types'; /** * Updates the values of the batch fees of the BatchConversionPayments contract, if needed. @@ -25,10 +24,14 @@ export const setupBatchConversionPayments = async ({ }): Promise => { // Setup contract parameters + // import ES Module in CommonJS + const { CurrencyManager, EvmChains } = await import('@requestnetwork/currency'); + const { RequestLogicTypes } = await import('@requestnetwork/types'); + // constants related to chainlink and conversion rate const currencyManager = CurrencyManager.getDefault(); - const setUpActions = async (network: CurrencyTypes.EvmChainName) => { + const setUpActions = async (network: EvmChainName) => { console.log(`Setup BatchConversionPayments on ${network}`); if (!contractAddress) { diff --git a/packages/smart-contracts/scripts-create2/contract-setup/setupChainlinkConversionPath.ts b/packages/smart-contracts/scripts-create2/contract-setup/setupChainlinkConversionPath.ts index b1c37075d3..b108bc499f 100644 --- a/packages/smart-contracts/scripts-create2/contract-setup/setupChainlinkConversionPath.ts +++ b/packages/smart-contracts/scripts-create2/contract-setup/setupChainlinkConversionPath.ts @@ -1,5 +1,3 @@ -import { CurrencyManager, EvmChains } from '@requestnetwork/currency'; -import { RequestLogicTypes } from '@requestnetwork/types'; import { chainlinkConversionPath } from '../../src/lib'; import { HardhatRuntimeEnvironmentExtended } from '../types'; import { getSignerAndGasFees, updateNativeTokenHash } from './adminTasks'; @@ -17,6 +15,10 @@ export const setupChainlinkConversionPath = async ({ contractAddress?: string; hre: HardhatRuntimeEnvironmentExtended; }): Promise => { + // import ES Module in CommonJS + const { CurrencyManager, EvmChains } = await import('@requestnetwork/currency'); + const { RequestLogicTypes } = await import('@requestnetwork/types'); + // Setup contract parameters await Promise.all( hre.config.xdeploy.networks.map(async (network) => { diff --git a/packages/smart-contracts/scripts-create2/contract-setup/setupERC20SwapToConversion.ts b/packages/smart-contracts/scripts-create2/contract-setup/setupERC20SwapToConversion.ts index 7606cd410a..77bb34fadb 100644 --- a/packages/smart-contracts/scripts-create2/contract-setup/setupERC20SwapToConversion.ts +++ b/packages/smart-contracts/scripts-create2/contract-setup/setupERC20SwapToConversion.ts @@ -6,7 +6,6 @@ import { updateRequestSwapFees, updateSwapRouter, } from './adminTasks'; -import { EvmChains } from '@requestnetwork/currency'; /** * Updates the values of the chainlinkConversionPath and swap router of the ERC20SwapToConversion contract @@ -21,6 +20,8 @@ export const setupERC20SwapToConversion = async ({ contractAddress?: string; hre: HardhatRuntimeEnvironmentExtended; }): Promise => { + // import ES Module in CommonJS + const { EvmChains } = await import('@requestnetwork/currency'); await Promise.all( hre.config.xdeploy.networks.map(async (network) => { try { diff --git a/packages/smart-contracts/scripts-create2/contract-setup/setupERC20SwapToPay.ts b/packages/smart-contracts/scripts-create2/contract-setup/setupERC20SwapToPay.ts index df7d7f89f4..b8b0ffbdff 100644 --- a/packages/smart-contracts/scripts-create2/contract-setup/setupERC20SwapToPay.ts +++ b/packages/smart-contracts/scripts-create2/contract-setup/setupERC20SwapToPay.ts @@ -1,4 +1,3 @@ -import { EvmChains } from '@requestnetwork/currency'; import { erc20SwapToPayArtifact } from '../../src/lib'; import { HardhatRuntimeEnvironmentExtended } from '../types'; import { getSignerAndGasFees, updateRequestSwapFees, updateSwapRouter } from './adminTasks'; @@ -16,6 +15,8 @@ export const setupERC20SwapToPay = async ({ contractAddress?: string; hre: HardhatRuntimeEnvironmentExtended; }): Promise => { + // import ES Module in CommonJS + const { EvmChains } = await import('@requestnetwork/currency'); await Promise.all( hre.config.xdeploy.networks.map(async (network) => { try { diff --git a/packages/smart-contracts/scripts-create2/contract-setup/setupETHConversionProxy.ts b/packages/smart-contracts/scripts-create2/contract-setup/setupETHConversionProxy.ts index 8dedd28156..7526b55259 100644 --- a/packages/smart-contracts/scripts-create2/contract-setup/setupETHConversionProxy.ts +++ b/packages/smart-contracts/scripts-create2/contract-setup/setupETHConversionProxy.ts @@ -1,5 +1,3 @@ -import { CurrencyManager, EvmChains } from '@requestnetwork/currency'; -import { RequestLogicTypes } from '@requestnetwork/types'; import { ethConversionArtifact } from '../../src/lib'; import { HardhatRuntimeEnvironmentExtended } from '../types'; import { @@ -25,7 +23,10 @@ export const setupETHConversionProxy = async ({ await Promise.all( hre.config.xdeploy.networks.map(async (network) => { try { - EvmChains.assertChainSupported(network); + // import ES Module in CommonJS + const { CurrencyManager } = await import('@requestnetwork/currency'); + const { RequestLogicTypes } = await import('@requestnetwork/types'); + Currency.EvmChains.assertChainSupported(network); if (!contractAddress) { contractAddress = ethConversionArtifact.getAddress(network); } diff --git a/packages/smart-contracts/scripts-create2/contract-setup/setupErc20ConversionProxy.ts b/packages/smart-contracts/scripts-create2/contract-setup/setupErc20ConversionProxy.ts index 349d081cf6..65f731dcbc 100644 --- a/packages/smart-contracts/scripts-create2/contract-setup/setupErc20ConversionProxy.ts +++ b/packages/smart-contracts/scripts-create2/contract-setup/setupErc20ConversionProxy.ts @@ -5,7 +5,6 @@ import { updateChainlinkConversionPath, updatePaymentFeeProxyAddress, } from './adminTasks'; -import { EvmChains } from '@requestnetwork/currency'; const ERC20ConversionVersion = '0.1.2'; @@ -22,6 +21,9 @@ export const setupErc20ConversionProxy = async ({ contractAddress?: string; hre: HardhatRuntimeEnvironmentExtended; }): Promise => { + // import ES Module in CommonJS + const { EvmChains } = await import('@requestnetwork/currency'); + await Promise.all( hre.config.xdeploy.networks.map(async (network) => { try { diff --git a/packages/smart-contracts/scripts-create2/deploy.ts b/packages/smart-contracts/scripts-create2/deploy.ts index b7a0c3754d..beeccaa064 100644 --- a/packages/smart-contracts/scripts-create2/deploy.ts +++ b/packages/smart-contracts/scripts-create2/deploy.ts @@ -2,7 +2,6 @@ import { create2ContractDeploymentList, isContractDeployed } from './utils'; import { HardhatRuntimeEnvironmentExtended, IDeploymentParams } from './types'; import { xdeploy } from './xdeployer'; import { getConstructorArgs } from './constructor-args'; -import { EvmChains } from '@requestnetwork/currency'; import { setupContract } from './contract-setup/setups'; /** @@ -21,14 +20,16 @@ export const deployOneWithCreate2 = async ( } // Deploy the contract on several network through xdeployer const deploymentResult = await xdeploy(deploymentParams, hre); - hre.config.xdeploy.networks.forEach((network, i) => { + hre.config.xdeploy.networks.forEach(async (network, i) => { if (deploymentResult[i].deployed) { console.log(`${deploymentParams.contract} successfully deployed:`); console.log(` On network: ${network}`); console.log(` At address: ${deploymentResult[i].address}`); console.log(` At block: ${deploymentResult[i].receipt.blockNumber}`); } else { - if (isContractDeployed(deploymentParams.contract, network, deploymentResult[i].address)) { + if ( + await isContractDeployed(deploymentParams.contract, network, deploymentResult[i].address) + ) { console.log(`${deploymentParams.contract} already deployed:`); console.log(` On network: ${network}`); console.log(` At address: ${deploymentResult[i].address}`); @@ -55,6 +56,8 @@ export const deployWithCreate2FromList = async ( ): Promise => { for (const contract of create2ContractDeploymentList) { const network = hre.config.xdeploy.networks[0]; + // import ES Module in CommonJS + const { EvmChains } = await import('@requestnetwork/currency'); EvmChains.assertChainSupported(network); const constructorArgs = getConstructorArgs(contract, network); const address = await deployOneWithCreate2({ contract, constructorArgs }, hre); diff --git a/packages/smart-contracts/scripts-create2/tenderly.ts b/packages/smart-contracts/scripts-create2/tenderly.ts index b4e247e452..fc65bfb134 100644 --- a/packages/smart-contracts/scripts-create2/tenderly.ts +++ b/packages/smart-contracts/scripts-create2/tenderly.ts @@ -4,8 +4,7 @@ import { ContractArtifact } from '../src/lib'; import { Contract } from 'ethers'; import * as console from 'console'; import axios from 'axios'; -import { EvmChains } from '@requestnetwork/currency'; -import { CurrencyTypes } from '@requestnetwork/types'; +import { EvmChainName } from '../src/types'; const getTenderlyAxiosInstance = (hre: HardhatRuntimeEnvironmentExtended) => { return axios.create({ @@ -22,7 +21,7 @@ const capitalizeFirstLetter = (string: string) => string.charAt(0).toUpperCase() * Chains supported by Tenderly. * Supported testnet chains are commented out. */ -const supportedTenderlyChains: CurrencyTypes.EvmChainName[] = [ +const supportedTenderlyChains: EvmChainName[] = [ 'arbitrum-one', 'arbitrum-rinkeby', 'avalanche', @@ -34,7 +33,6 @@ const supportedTenderlyChains: CurrencyTypes.EvmChainName[] = [ 'moonbeam', 'mumbai', 'optimism', - 'rinkeby', 'xdai', ]; @@ -45,6 +43,8 @@ const getTenderlyContractId = (c: TenderlyContract) => export const tenderlyImportAll = async (hre: HardhatRuntimeEnvironmentExtended): Promise => { try { + // import ES Module in CommonJS + const { EvmChains } = await import('@requestnetwork/currency'); const { username, project } = hre.config.tenderly; const contracts: Record = {}; const mainnetContracts: Set = new Set(); diff --git a/packages/smart-contracts/scripts-create2/utils.ts b/packages/smart-contracts/scripts-create2/utils.ts index 7df30c1378..68cdd9ff45 100644 --- a/packages/smart-contracts/scripts-create2/utils.ts +++ b/packages/smart-contracts/scripts-create2/utils.ts @@ -1,6 +1,5 @@ import { Contract } from 'ethers'; import * as artifacts from '../src/lib'; -import { EvmChains } from '@requestnetwork/currency'; /** * List of smart contract that we deploy using the CREATE2 scheme through the Request Deployer contract @@ -67,12 +66,14 @@ export const getArtifact = (contract: string): artifacts.ContractArtifact { +): Promise => { try { + // import ES Module in CommonJS + const { EvmChains } = await import('@requestnetwork/currency'); EvmChains.assertChainSupported(network); const contractArtifact = getArtifact(contract); const addresses = contractArtifact.getAllAddresses(network); diff --git a/packages/smart-contracts/scripts-create2/verify.ts b/packages/smart-contracts/scripts-create2/verify.ts index b128b711f9..28a879f8fe 100644 --- a/packages/smart-contracts/scripts-create2/verify.ts +++ b/packages/smart-contracts/scripts-create2/verify.ts @@ -2,7 +2,6 @@ import { computeCreate2DeploymentAddress } from './compute-one-address'; import { getConstructorArgs } from './constructor-args'; import { HardhatRuntimeEnvironmentExtended, IDeploymentParams } from './types'; import { create2ContractDeploymentList } from './utils'; -import { EvmChains } from '@requestnetwork/currency'; export const verifyOne = async ( contractAddress: string, @@ -49,6 +48,8 @@ export async function VerifyCreate2FromList(hre: HardhatRuntimeEnvironmentExtend case 'BatchConversionPayments': case 'ERC20TransferableReceivable': { const network = hre.config.xdeploy.networks[0]; + // import ES Module in CommonJS + const { EvmChains } = await import('@requestnetwork/currency'); EvmChains.assertChainSupported(network); const constructorArgs = getConstructorArgs(contract, network); address = await computeCreate2DeploymentAddress({ contract, constructorArgs }, hre); diff --git a/packages/smart-contracts/scripts-create2/xdeployer.ts b/packages/smart-contracts/scripts-create2/xdeployer.ts index be8c9a1955..9710339485 100644 --- a/packages/smart-contracts/scripts-create2/xdeployer.ts +++ b/packages/smart-contracts/scripts-create2/xdeployer.ts @@ -1,12 +1,6 @@ import { HardhatRuntimeEnvironmentExtended, IDeploymentParams, IDeploymentResult } from './types'; import { requestDeployer } from '../src/lib'; import { Overrides } from 'ethers'; -import { - normalizeGasFees, - getCeloProvider, - getDefaultProvider, - isEip1559Supported, -} from '@requestnetwork/utils'; import { suggestFeesEip1559 } from './fee-suggestion'; const ZERO_ETH_INPUT = 0; @@ -46,6 +40,9 @@ export const xdeploy = async ( initcode = await Contract.getDeployTransaction(); } + // import ES Module in CommonJS + const { getCeloProvider, getDefaultProvider, isEip1559Supported, normalizeGasFees } = + await import('@requestnetwork/utils'); for (const network of hre.config.xdeploy.networks) { console.log(`... on ${network}`); let provider; diff --git a/packages/smart-contracts/scripts/conversion-proxy.ts b/packages/smart-contracts/scripts/conversion-proxy.ts index 682cdd151e..d2991ebcba 100644 --- a/packages/smart-contracts/scripts/conversion-proxy.ts +++ b/packages/smart-contracts/scripts/conversion-proxy.ts @@ -7,8 +7,6 @@ import { ethConversionArtifact, } from '../src/lib'; import { deployOne } from './deploy-one'; -import { CurrencyManager } from '@requestnetwork/currency'; -import { RequestLogicTypes } from '@requestnetwork/types'; export async function deployERC20ConversionProxy( args: { @@ -72,6 +70,10 @@ export async function deployEthConversionProxy( // The private native token hash is the same as on mainnet const nativeTokenNetwork = hre.network.name === 'private' ? 'mainnet' : hre.network.name; + + // import ES Module in CommonJS + const { CurrencyManager } = await import('@requestnetwork/currency'); + const { RequestLogicTypes } = await import('@requestnetwork/types'); const nativeTokenHash = CurrencyManager.getDefault().getNativeCurrency( RequestLogicTypes.CURRENCY.ETH, nativeTokenNetwork, diff --git a/packages/smart-contracts/scripts/deploy-one.ts b/packages/smart-contracts/scripts/deploy-one.ts index 1bfb1f04d1..39fc97703e 100644 --- a/packages/smart-contracts/scripts/deploy-one.ts +++ b/packages/smart-contracts/scripts/deploy-one.ts @@ -2,7 +2,6 @@ import '@nomiclabs/hardhat-ethers'; import { HardhatRuntimeEnvironment } from 'hardhat/types'; import { Contract } from 'ethers'; import { ContractArtifact } from '../src/lib'; -import { EvmChains } from '@requestnetwork/currency'; export interface DeploymentResult { address: string; @@ -61,6 +60,8 @@ export async function deployOne( if (options?.artifact) { try { const chain = hre.network.name; + // import ES Module in CommonJS + const { EvmChains } = await import('@requestnetwork/currency'); EvmChains.assertChainSupported(chain); address = options.artifact.getAddress(chain, options.version); const action = args.force ? '(forcing deployment)' : '(skipping)'; diff --git a/packages/smart-contracts/scripts/deploy-payments.ts b/packages/smart-contracts/scripts/deploy-payments.ts index d760243b1c..17555a8c59 100644 --- a/packages/smart-contracts/scripts/deploy-payments.ts +++ b/packages/smart-contracts/scripts/deploy-payments.ts @@ -14,8 +14,6 @@ import { ChainlinkConversionPath } from '../src/types/ChainlinkConversionPath'; // eslint-disable-next-line // @ts-ignore Cannot find module import { EthConversionProxy } from '../src/types/EthConversionProxy'; -import { CurrencyManager } from '@requestnetwork/currency'; -import { RequestLogicTypes } from '@requestnetwork/types'; import { HardhatRuntimeEnvironmentExtended } from '../scripts-create2/types'; import { computeCreate2DeploymentAddress } from '../scripts-create2/compute-one-address'; @@ -70,6 +68,9 @@ export async function deployAllPaymentContracts( // #region NATIVE TOKEN const nativeTokenNetwork = hre.network.name === 'private' ? 'mainnet' : hre.network.name; + // import ES Module in CommonJS + const { CurrencyManager } = await import('@requestnetwork/currency'); + const { RequestLogicTypes } = await import('@requestnetwork/types'); const nativeTokenHash = CurrencyManager.getDefault().getNativeCurrency( RequestLogicTypes.CURRENCY.ETH, nativeTokenNetwork, diff --git a/packages/smart-contracts/scripts/test-deploy-batch-conversion-deployment.ts b/packages/smart-contracts/scripts/test-deploy-batch-conversion-deployment.ts index cff4bfef7e..502b75b910 100644 --- a/packages/smart-contracts/scripts/test-deploy-batch-conversion-deployment.ts +++ b/packages/smart-contracts/scripts/test-deploy-batch-conversion-deployment.ts @@ -11,7 +11,6 @@ import { ethConversionArtifact, ethereumFeeProxyArtifact, } from '../src/lib'; -import { CurrencyManager, EvmChains } from '@requestnetwork/currency'; import { deployAddressChecking } from './utils'; import { BigNumber } from 'ethers'; import { PRECISION_RATE } from './test-deploy_chainlink_contract'; @@ -26,6 +25,8 @@ export async function deployBatchConversionPayment( try { console.log('Deploy BatchConversionPayments'); const chain = hre.network.name; + // import ES Module in CommonJS + const { CurrencyManager, EvmChains } = await import('@requestnetwork/currency'); EvmChains.assertChainSupported(chain); const _ERC20FeeProxyAddress = erc20FeeProxyArtifact.getAddress('private'); const _EthereumFeeProxyAddress = ethereumFeeProxyArtifact.getAddress('private'); diff --git a/packages/smart-contracts/scripts/test-deploy-batch-erc-eth-deployment.ts b/packages/smart-contracts/scripts/test-deploy-batch-erc-eth-deployment.ts index 2d115a3f07..6f30a77867 100644 --- a/packages/smart-contracts/scripts/test-deploy-batch-erc-eth-deployment.ts +++ b/packages/smart-contracts/scripts/test-deploy-batch-erc-eth-deployment.ts @@ -4,12 +4,13 @@ import { deployOne } from '../scripts/deploy-one'; import { batchPaymentsArtifact } from '../src/lib'; import { deployAddressChecking } from './utils'; -import { EvmChains } from '@requestnetwork/currency'; // Deploys, set up the contracts export async function deployBatchPayment(args: any, hre: HardhatRuntimeEnvironment): Promise { try { const chain = hre.network.name; + // import ES Module in CommonJS + const { EvmChains } = await import('@requestnetwork/currency'); EvmChains.assertChainSupported(chain); const ERC20FeeProxyAddress = '0x75c35C980C0d37ef46DF04d31A140b65503c0eEd'; const EthereumFeeProxyAddress = '0x3d49d1eF2adE060a33c6E6Aa213513A7EE9a6241'; diff --git a/packages/smart-contracts/scripts/test-deploy_chainlink_contract.ts b/packages/smart-contracts/scripts/test-deploy_chainlink_contract.ts index be32fc4e61..abbd7812c5 100644 --- a/packages/smart-contracts/scripts/test-deploy_chainlink_contract.ts +++ b/packages/smart-contracts/scripts/test-deploy_chainlink_contract.ts @@ -1,5 +1,4 @@ import '@nomiclabs/hardhat-ethers'; -import { CurrencyManager } from '@requestnetwork/currency'; import { HardhatRuntimeEnvironment } from 'hardhat/types'; import { deployERC20ConversionProxy, deployEthConversionProxy } from './conversion-proxy'; import { deploySwapConversion } from './erc20-swap-to-conversion'; @@ -32,6 +31,9 @@ export default async function deploy( }); const { address: USDT_fake_address } = await deployOne(args, hre, 'UsdtFake'); + // import ES Module in CommonJS + const { CurrencyManager } = await import('@requestnetwork/currency'); + const currencyManager = CurrencyManager.getDefault(); // all these addresses are for test purposes const ETH_hash = currencyManager.fromSymbol('ETH')!.hash; diff --git a/packages/smart-contracts/src/types.ts b/packages/smart-contracts/src/types.ts new file mode 100644 index 0000000000..e93343086c --- /dev/null +++ b/packages/smart-contracts/src/types.ts @@ -0,0 +1,23 @@ +export type EvmChainName = + | 'alfajores' + | 'arbitrum-one' + | 'arbitrum-rinkeby' + | 'avalanche' + | 'bsc' + | 'bsctest' + | 'celo' + | 'fantom' + | 'fuse' + | 'goerli' + | 'mainnet' + | 'mantle' + | 'mantle-testnet' + | 'matic' + | 'moonbeam' + | 'mumbai' + | 'optimism' + | 'private' + | 'ronin' + | 'sokol' + | 'tombchain' + | 'xdai'; diff --git a/packages/thegraph-data-access/package.json b/packages/thegraph-data-access/package.json index 7affee737a..9e565ca24b 100644 --- a/packages/thegraph-data-access/package.json +++ b/packages/thegraph-data-access/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/thegraph-data-access", "version": "0.35.2", + "type": "module", "publishConfig": { "access": "public" }, @@ -47,7 +48,7 @@ "ethers": "5.5.1", "graphql-request": "3.4.0", "tslib": "2.5.0", - "typed-emitter": "1.4.0" + "tiny-typed-emitter": "2.1.0" }, "devDependencies": { "@types/jest": "26.0.13", diff --git a/packages/thegraph-data-access/src/data-access.ts b/packages/thegraph-data-access/src/data-access.ts index 19bf9333ad..ba1bb7fdae 100644 --- a/packages/thegraph-data-access/src/data-access.ts +++ b/packages/thegraph-data-access/src/data-access.ts @@ -1,5 +1,5 @@ import { EventEmitter } from 'events'; -import TypedEmitter from 'typed-emitter'; +import { TypedEmitter } from 'tiny-typed-emitter'; import { BigNumber } from 'ethers'; @@ -7,9 +7,9 @@ import { getCurrentTimestampInSecond, retry, SimpleLogger } from '@requestnetwor import { Block, CombinedDataAccess } from '@requestnetwork/data-access'; import { DataAccessTypes, LogTypes, StorageTypes } from '@requestnetwork/types'; -import { Transaction } from './queries'; -import { SubgraphClient } from './subgraph-client'; -import { PendingStore } from './pending-store'; +import { Transaction } from './queries.js'; +import { SubgraphClient } from './subgraph-client.js'; +import { PendingStore } from './pending-store.js'; import { RequestInit } from 'graphql-request/dist/types.dom'; type TheGraphDataAccessBaseOptions = { diff --git a/packages/thegraph-data-access/src/index.ts b/packages/thegraph-data-access/src/index.ts index cb60f77cb5..9c41af0f77 100644 --- a/packages/thegraph-data-access/src/index.ts +++ b/packages/thegraph-data-access/src/index.ts @@ -3,7 +3,7 @@ export { TheGraphDataRead, TheGraphDataWrite, TheGraphDataAccessOptions, -} from './data-access'; -export { PendingStore } from './pending-store'; -export { SubgraphClient } from './subgraph-client'; -export * as queries from './queries'; +} from './data-access.js'; +export { PendingStore } from './pending-store.js'; +export { SubgraphClient } from './subgraph-client.js'; +export * as queries from './queries.js'; diff --git a/packages/thegraph-data-access/src/subgraph-client.ts b/packages/thegraph-data-access/src/subgraph-client.ts index c26801e446..a97006e512 100644 --- a/packages/thegraph-data-access/src/subgraph-client.ts +++ b/packages/thegraph-data-access/src/subgraph-client.ts @@ -7,7 +7,7 @@ import { GetTransactionsByHashQuery, Meta, TransactionsBody, -} from './queries'; +} from './queries.js'; import { RequestInit } from 'graphql-request/dist/types.dom'; // Max Int value (as supported by grapqhl types) diff --git a/packages/toolbox/package.json b/packages/toolbox/package.json index c6332870d0..fd703d139f 100644 --- a/packages/toolbox/package.json +++ b/packages/toolbox/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/toolbox", "version": "0.7.0", + "type": "module", "private": true, "description": "Toolbox for Request Network.", "keywords": [ @@ -50,7 +51,7 @@ "@requestnetwork/smart-contracts": "0.30.0", "@requestnetwork/types": "0.37.0", "@requestnetwork/utils": "0.37.0", - "axios": "0.27.2", + "axios": "1.5.1", "ethers": "5.5.1", "inquirer": "8.2.0", "lodash": "4.17.21", diff --git a/packages/toolbox/src/commands/chainlink/addAggregator.ts b/packages/toolbox/src/commands/chainlink/addAggregator.ts index 7492f8da13..932e965b09 100644 --- a/packages/toolbox/src/commands/chainlink/addAggregator.ts +++ b/packages/toolbox/src/commands/chainlink/addAggregator.ts @@ -1,6 +1,6 @@ import * as yargs from 'yargs'; -import { runUpdate } from './contractUtils'; -import { getAllAggregators, getCurrencyManager } from './aggregatorsUtils'; +import { runUpdate } from './contractUtils.js'; +import { getAllAggregators, getCurrencyManager } from './aggregatorsUtils.js'; import assert from 'assert'; import { EvmChains } from '@requestnetwork/currency'; diff --git a/packages/toolbox/src/commands/chainlink/addAggregators.ts b/packages/toolbox/src/commands/chainlink/addAggregators.ts index 0b036e8988..796a9a2b3b 100644 --- a/packages/toolbox/src/commands/chainlink/addAggregators.ts +++ b/packages/toolbox/src/commands/chainlink/addAggregators.ts @@ -1,7 +1,7 @@ import * as yargs from 'yargs'; import inquirer from 'inquirer'; -import { runUpdate } from './contractUtils'; -import { Aggregator, getAvailableAggregators, getCurrencyManager } from './aggregatorsUtils'; +import { runUpdate } from './contractUtils.js'; +import { Aggregator, getAvailableAggregators, getCurrencyManager } from './aggregatorsUtils.js'; import { conversionSupportedNetworks, EvmChains } from '@requestnetwork/currency'; type Options = { diff --git a/packages/toolbox/src/commands/chainlink/currencyHash.ts b/packages/toolbox/src/commands/chainlink/currencyHash.ts index 9ee4c99c23..8868dd26ea 100644 --- a/packages/toolbox/src/commands/chainlink/currencyHash.ts +++ b/packages/toolbox/src/commands/chainlink/currencyHash.ts @@ -1,4 +1,4 @@ -import { IOptions, showCurrencyHash } from '../../chainlinkConversionPathTools'; +import { IOptions, showCurrencyHash } from '../../chainlinkConversionPathTools.js'; import * as yargs from 'yargs'; export const command = 'currencyHash '; diff --git a/packages/toolbox/src/commands/chainlink/deleteAggregator.ts b/packages/toolbox/src/commands/chainlink/deleteAggregator.ts index 19e0898f47..46631276c0 100644 --- a/packages/toolbox/src/commands/chainlink/deleteAggregator.ts +++ b/packages/toolbox/src/commands/chainlink/deleteAggregator.ts @@ -1,7 +1,7 @@ /* eslint-disable complexity */ import * as yargs from 'yargs'; import { ethers } from 'ethers'; -import { runUpdate } from './contractUtils'; +import { runUpdate } from './contractUtils.js'; type Options = { dryRun: boolean; diff --git a/packages/toolbox/src/commands/chainlink/listAggregators.ts b/packages/toolbox/src/commands/chainlink/listAggregators.ts index be01022572..95c5f50e0d 100644 --- a/packages/toolbox/src/commands/chainlink/listAggregators.ts +++ b/packages/toolbox/src/commands/chainlink/listAggregators.ts @@ -1,5 +1,5 @@ import * as yargs from 'yargs'; -import { IOptions, listAggregators } from '../../chainlinkConversionPathTools'; +import { IOptions, listAggregators } from '../../chainlinkConversionPathTools.js'; export const command = 'listAggregators [network]'; export const describe = 'Helper for on-chain conversion administration'; diff --git a/packages/toolbox/src/commands/chainlink/listMissingAggregators.ts b/packages/toolbox/src/commands/chainlink/listMissingAggregators.ts index c7816cca14..a5ed33d122 100644 --- a/packages/toolbox/src/commands/chainlink/listMissingAggregators.ts +++ b/packages/toolbox/src/commands/chainlink/listMissingAggregators.ts @@ -1,5 +1,5 @@ import * as yargs from 'yargs'; -import { getAvailableAggregators, getCurrencyManager } from './aggregatorsUtils'; +import { getAvailableAggregators, getCurrencyManager } from './aggregatorsUtils.js'; import { EvmChains } from '@requestnetwork/currency'; type Options = { diff --git a/packages/toolbox/src/commands/hash/submit.ts b/packages/toolbox/src/commands/hash/submit.ts index 3b345da6fa..de45e1ac73 100644 --- a/packages/toolbox/src/commands/hash/submit.ts +++ b/packages/toolbox/src/commands/hash/submit.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable no-console */ -import { InferArgs } from '../../types'; +import { InferArgs } from '../../types.js'; import yargs from 'yargs'; -import { getWallet } from '../transaction/utils'; +import { getWallet } from '../transaction/utils.js'; import { EthereumTransactionSubmitter, IpfsStorage } from '@requestnetwork/ethereum-storage'; import { StorageTypes } from '@requestnetwork/types'; import { EvmChains } from '@requestnetwork/currency'; diff --git a/packages/toolbox/src/commands/request/create.ts b/packages/toolbox/src/commands/request/create.ts index f1caa0e034..b74c3321c0 100644 --- a/packages/toolbox/src/commands/request/create.ts +++ b/packages/toolbox/src/commands/request/create.ts @@ -1,4 +1,4 @@ -import CreateRequest from '../../create-request'; +import CreateRequest from '../../create-request.js'; export const command = 'request create [amount]'; export const describe = 'Create a test request'; diff --git a/packages/toolbox/src/commands/transaction/nonce.ts b/packages/toolbox/src/commands/transaction/nonce.ts index 9200f639ba..f372d8b080 100644 --- a/packages/toolbox/src/commands/transaction/nonce.ts +++ b/packages/toolbox/src/commands/transaction/nonce.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import * as yargs from 'yargs'; -import { InferArgs } from '../../types'; -import { getProvider, getWallet } from './utils'; +import { InferArgs } from '../../types.js'; +import { getProvider, getWallet } from './utils.js'; export const command = 'nonce'; export const describe = 'Gets a wallet nonce'; diff --git a/packages/toolbox/src/commands/transaction/retry.ts b/packages/toolbox/src/commands/transaction/retry.ts index 3aa66025fa..db6ddb33ea 100644 --- a/packages/toolbox/src/commands/transaction/retry.ts +++ b/packages/toolbox/src/commands/transaction/retry.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable no-console */ -import { InferArgs } from '../../types'; +import { InferArgs } from '../../types.js'; import yargs from 'yargs'; -import { getWallet } from './utils'; +import { getWallet } from './utils.js'; import { providers, utils } from 'ethers'; export const command = 'transaction retry '; diff --git a/packages/toolbox/src/index.ts b/packages/toolbox/src/index.ts index 43fb8e16f5..053acde0e8 100644 --- a/packages/toolbox/src/index.ts +++ b/packages/toolbox/src/index.ts @@ -1,4 +1,4 @@ -import CreateRequest from './create-request'; +import CreateRequest from './create-request.js'; // Exports the functions so that can be imported from other packages export default { diff --git a/packages/transaction-manager/package.json b/packages/transaction-manager/package.json index 77633591b6..d34b9d4cc3 100644 --- a/packages/transaction-manager/package.json +++ b/packages/transaction-manager/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/transaction-manager", "version": "0.28.0", + "type": "module", "publishConfig": { "access": "public" }, diff --git a/packages/transaction-manager/src/channel-parser.ts b/packages/transaction-manager/src/channel-parser.ts index 9cac64ce88..da8e784ff4 100644 --- a/packages/transaction-manager/src/channel-parser.ts +++ b/packages/transaction-manager/src/channel-parser.ts @@ -1,6 +1,6 @@ import { DecryptionProviderTypes, EncryptionTypes, TransactionTypes } from '@requestnetwork/types'; -import TransactionsParser from './transactions-parser'; +import TransactionsParser from './transactions-parser.js'; /** * Class to parse channels from a list of transactions and their channel id diff --git a/packages/transaction-manager/src/index.ts b/packages/transaction-manager/src/index.ts index e7458738b5..74e60965f4 100644 --- a/packages/transaction-manager/src/index.ts +++ b/packages/transaction-manager/src/index.ts @@ -1 +1 @@ -export { default as TransactionManager } from './transaction-manager'; +export { default as TransactionManager } from './transaction-manager.js'; diff --git a/packages/transaction-manager/src/transaction-manager.ts b/packages/transaction-manager/src/transaction-manager.ts index 7a0d88f3f4..9c3a6e41f9 100644 --- a/packages/transaction-manager/src/transaction-manager.ts +++ b/packages/transaction-manager/src/transaction-manager.ts @@ -9,8 +9,8 @@ import { normalizeKeccak256Hash } from '@requestnetwork/utils'; import { EventEmitter } from 'events'; -import ChannelParser from './channel-parser'; -import TransactionsFactory from './transactions-factory'; +import ChannelParser from './channel-parser.js'; +import TransactionsFactory from './transactions-factory.js'; /** * Implementation of TransactionManager layer without encryption diff --git a/packages/transaction-manager/src/transactions-parser.ts b/packages/transaction-manager/src/transactions-parser.ts index 744697eaf7..52c3c4314e 100644 --- a/packages/transaction-manager/src/transactions-parser.ts +++ b/packages/transaction-manager/src/transactions-parser.ts @@ -6,8 +6,8 @@ import { TransactionTypes, } from '@requestnetwork/types'; -import ClearTransaction from './clear-transaction'; -import EncryptedTransaction from './encrypted-transaction'; +import ClearTransaction from './clear-transaction.js'; +import EncryptedTransaction from './encrypted-transaction.js'; /** * Class to parse transactions diff --git a/packages/transaction-manager/test/index.test.ts b/packages/transaction-manager/test/index.test.ts index caadb683f2..dda91868bc 100644 --- a/packages/transaction-manager/test/index.test.ts +++ b/packages/transaction-manager/test/index.test.ts @@ -5,11 +5,11 @@ import { EventEmitter } from 'events'; import { DataAccessTypes, EncryptionTypes, TransactionTypes } from '@requestnetwork/types'; -import { TransactionManager } from '../src/index'; -import TransactionsFactory from '../src/transactions-factory'; -import TransactionsParser from '../src/transactions-parser'; +import { TransactionManager } from '../src/index.js'; +import TransactionsFactory from '../src/transactions-factory.js'; +import TransactionsParser from '../src/transactions-parser.js'; -import * as TestData from './unit/utils/test-data'; +import * as TestData from './unit/utils/test-data.js'; const extraTopics = ['topic1', 'topic2']; const fakeTxHash = '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'; diff --git a/packages/transaction-manager/test/unit/channel-parser.test.ts b/packages/transaction-manager/test/unit/channel-parser.test.ts index 6ad4b4cfae..d009de9440 100644 --- a/packages/transaction-manager/test/unit/channel-parser.test.ts +++ b/packages/transaction-manager/test/unit/channel-parser.test.ts @@ -1,8 +1,8 @@ import MultiFormat from '@requestnetwork/multi-format'; import { TransactionTypes } from '@requestnetwork/types'; -import ChannelParser from '../../src/channel-parser'; -import TransactionsFactory from '../../src/transactions-factory'; -import * as TestData from './utils/test-data'; +import ChannelParser from '../../src/channel-parser.js'; +import TransactionsFactory from '../../src/transactions-factory.js'; +import * as TestData from './utils/test-data.js'; import { normalizeKeccak256Hash } from '@requestnetwork/utils'; let channelParser: ChannelParser; diff --git a/packages/transaction-manager/test/unit/clear-transaction.test.ts b/packages/transaction-manager/test/unit/clear-transaction.test.ts index 52b1aaf7ef..6d9a85a2a2 100644 --- a/packages/transaction-manager/test/unit/clear-transaction.test.ts +++ b/packages/transaction-manager/test/unit/clear-transaction.test.ts @@ -1,5 +1,5 @@ import MultiFormat from '@requestnetwork/multi-format'; -import ClearTransaction from '../../src/clear-transaction'; +import ClearTransaction from '../../src/clear-transaction.js'; import { normalizeKeccak256Hash } from '@requestnetwork/utils'; const data = '{ "what": "ever", "it": "is,", "this": "must", "work": true }'; diff --git a/packages/transaction-manager/test/unit/encryption-transaction.test.ts b/packages/transaction-manager/test/unit/encryption-transaction.test.ts index c42d65ded0..8e280fdb19 100644 --- a/packages/transaction-manager/test/unit/encryption-transaction.test.ts +++ b/packages/transaction-manager/test/unit/encryption-transaction.test.ts @@ -1,7 +1,7 @@ import MultiFormat from '@requestnetwork/multi-format'; import { EncryptionTypes } from '@requestnetwork/types'; -import EncryptedTransaction from '../../src/encrypted-transaction'; +import EncryptedTransaction from '../../src/encrypted-transaction.js'; import { encrypt, normalizeKeccak256Hash } from '@requestnetwork/utils'; const data = '{ "what": "ever", "it": "is,", "this": "must", "work": true }'; diff --git a/packages/transaction-manager/test/unit/transactions-factory.test.ts b/packages/transaction-manager/test/unit/transactions-factory.test.ts index d589d8f83b..2c1fc3f4f1 100644 --- a/packages/transaction-manager/test/unit/transactions-factory.test.ts +++ b/packages/transaction-manager/test/unit/transactions-factory.test.ts @@ -1,7 +1,7 @@ import MultiFormat from '@requestnetwork/multi-format'; import { EncryptionTypes, MultiFormatTypes } from '@requestnetwork/types'; -import TransactionsFactory from '../../src/transactions-factory'; -import * as TestData from './utils/test-data'; +import TransactionsFactory from '../../src/transactions-factory.js'; +import * as TestData from './utils/test-data.js'; const data = '{ "what": "ever", "it": "is,", "this": "must", "work": true }'; diff --git a/packages/transaction-manager/test/unit/transactions-parser.test.ts b/packages/transaction-manager/test/unit/transactions-parser.test.ts index 54ac90c4a2..a2de1d49ea 100644 --- a/packages/transaction-manager/test/unit/transactions-parser.test.ts +++ b/packages/transaction-manager/test/unit/transactions-parser.test.ts @@ -1,7 +1,7 @@ import { EncryptionTypes, TransactionTypes } from '@requestnetwork/types'; -import TransactionsFactory from '../../src/transactions-factory'; -import TransactionsParser from '../../src/transactions-parser'; -import * as TestData from './utils/test-data'; +import TransactionsFactory from '../../src/transactions-factory.js'; +import TransactionsParser from '../../src/transactions-parser.js'; +import * as TestData from './utils/test-data.js'; let transactionParser: TransactionsParser; diff --git a/packages/types/package.json b/packages/types/package.json index 3b590043fd..02917ec34a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/types", "version": "0.37.0", + "type": "module", "publishConfig": { "access": "public" }, diff --git a/packages/types/src/advanced-logic-types.ts b/packages/types/src/advanced-logic-types.ts index 7861176483..6bf8d10b67 100644 --- a/packages/types/src/advanced-logic-types.ts +++ b/packages/types/src/advanced-logic-types.ts @@ -1,7 +1,7 @@ -import * as Extension from './extension-types'; -import * as Identity from './identity-types'; -import * as RequestLogic from './request-logic-types'; -import { ChainName } from './currency-types'; +import * as Extension from './extension-types.js'; +import * as Identity from './identity-types.js'; +import * as RequestLogic from './request-logic-types.js'; +import { ChainName } from './currency-types.js'; /** Advanced Logic extensions */ export interface IAdvancedLogicExtensions { diff --git a/packages/types/src/client-types.ts b/packages/types/src/client-types.ts index cad1a724b8..d268541aef 100644 --- a/packages/types/src/client-types.ts +++ b/packages/types/src/client-types.ts @@ -1,6 +1,6 @@ -import * as Identity from './identity-types'; -import * as Payment from './payment-types'; -import * as RequestLogic from './request-logic-types'; +import * as Identity from './identity-types.js'; +import * as Payment from './payment-types.js'; +import * as RequestLogic from './request-logic-types.js'; /** Restrict research between two timestamp */ export interface ITimestampBoundaries { diff --git a/packages/types/src/data-access-types.ts b/packages/types/src/data-access-types.ts index ea814af55f..7ad65795d2 100644 --- a/packages/types/src/data-access-types.ts +++ b/packages/types/src/data-access-types.ts @@ -1,5 +1,5 @@ import { EventEmitter } from 'events'; -import * as StorageTypes from './storage-types'; +import * as StorageTypes from './storage-types.js'; /** Data Access Layer */ export interface IDataRead { diff --git a/packages/types/src/decryption-provider-types.ts b/packages/types/src/decryption-provider-types.ts index f5d4b30c46..fb4247b537 100644 --- a/packages/types/src/decryption-provider-types.ts +++ b/packages/types/src/decryption-provider-types.ts @@ -1,5 +1,5 @@ -import * as Encryption from './encryption-types'; -import * as Identity from './identity-types'; +import * as Encryption from './encryption-types.js'; +import * as Identity from './identity-types.js'; /** Decryption provider interface */ export interface IDecryptionProvider { diff --git a/packages/types/src/extension-types.ts b/packages/types/src/extension-types.ts index 5331df4e34..25cc8dfbef 100644 --- a/packages/types/src/extension-types.ts +++ b/packages/types/src/extension-types.ts @@ -1,14 +1,14 @@ -import * as ContentData from './extensions/content-data-types'; -import * as PnAddressBased from './extensions/pn-any-address-based-types'; -import * as PnAnyDeclarative from './extensions/pn-any-declarative-types'; -import * as PnStreamReferenceBased from './extensions/pn-any-stream-reference-based-types'; -import * as PnFeeReferenceBased from './extensions/pn-any-fee-reference-based-types'; -import * as PnReferenceBased from './extensions/pn-any-reference-based-types'; -import * as PnAnyToErc20 from './extensions/pn-any-to-erc20-types'; -import * as PnAnyToEth from './extensions/pn-any-to-eth-types'; -import * as PnAnyToAnyConversion from './extensions/pn-any-to-any-conversion-types'; -import * as Identity from './identity-types'; -import * as RequestLogic from './request-logic-types'; +import * as ContentData from './extensions/content-data-types.js'; +import * as PnAddressBased from './extensions/pn-any-address-based-types.js'; +import * as PnAnyDeclarative from './extensions/pn-any-declarative-types.js'; +import * as PnStreamReferenceBased from './extensions/pn-any-stream-reference-based-types.js'; +import * as PnFeeReferenceBased from './extensions/pn-any-fee-reference-based-types.js'; +import * as PnReferenceBased from './extensions/pn-any-reference-based-types.js'; +import * as PnAnyToErc20 from './extensions/pn-any-to-erc20-types.js'; +import * as PnAnyToEth from './extensions/pn-any-to-eth-types.js'; +import * as PnAnyToAnyConversion from './extensions/pn-any-to-any-conversion-types.js'; +import * as Identity from './identity-types.js'; +import * as RequestLogic from './request-logic-types.js'; export { ContentData, diff --git a/packages/types/src/extensions/content-data-types.ts b/packages/types/src/extensions/content-data-types.ts index 4321e553b0..8752129c70 100644 --- a/packages/types/src/extensions/content-data-types.ts +++ b/packages/types/src/extensions/content-data-types.ts @@ -1,4 +1,4 @@ -import * as Extension from '../extension-types'; +import * as Extension from '../extension-types.js'; /** Manager of the extension */ export interface IContentData extends Extension.IExtension { diff --git a/packages/types/src/extensions/pn-any-address-based-types.ts b/packages/types/src/extensions/pn-any-address-based-types.ts index 3fc70ebd9b..04b3857e81 100644 --- a/packages/types/src/extensions/pn-any-address-based-types.ts +++ b/packages/types/src/extensions/pn-any-address-based-types.ts @@ -1,5 +1,5 @@ -// import * as Extension from '../extension-types'; -import { PnAnyDeclarative, IAction } from '../extension-types'; +// import * as Extension from '../extension-types.js'; +import { PnAnyDeclarative, IAction } from '../extension-types.js'; /** Manager of the extension */ export interface IAddressBased diff --git a/packages/types/src/extensions/pn-any-declarative-types.ts b/packages/types/src/extensions/pn-any-declarative-types.ts index bafc613a6a..7d1d86fe65 100644 --- a/packages/types/src/extensions/pn-any-declarative-types.ts +++ b/packages/types/src/extensions/pn-any-declarative-types.ts @@ -1,6 +1,6 @@ -import { IIdentity } from '../identity-types'; -import * as Extension from '../extension-types'; -import * as RequestLogicTypes from '../request-logic-types'; +import { IIdentity } from '../identity-types.js'; +import * as Extension from '../extension-types.js'; +import * as RequestLogicTypes from '../request-logic-types.js'; /** Manager of the extension */ export interface IAnyDeclarative diff --git a/packages/types/src/extensions/pn-any-fee-reference-based-types.ts b/packages/types/src/extensions/pn-any-fee-reference-based-types.ts index a5a896b4d4..5f4e1fd187 100644 --- a/packages/types/src/extensions/pn-any-fee-reference-based-types.ts +++ b/packages/types/src/extensions/pn-any-fee-reference-based-types.ts @@ -1,8 +1,8 @@ -import { PnReferenceBased, IAction } from '../extension-types'; +import { PnReferenceBased, IAction } from '../extension-types.js'; export { IAddPaymentAddressParameters, IAddRefundAddressParameters, -} from './pn-any-reference-based-types'; +} from './pn-any-reference-based-types.js'; /** Fee reference-based payment network extension interface */ export interface IFeeReferenceBased diff --git a/packages/types/src/extensions/pn-any-reference-based-types.ts b/packages/types/src/extensions/pn-any-reference-based-types.ts index b9861a38d3..400ca49c9c 100644 --- a/packages/types/src/extensions/pn-any-reference-based-types.ts +++ b/packages/types/src/extensions/pn-any-reference-based-types.ts @@ -1,10 +1,10 @@ -import { PnAddressBased } from '../extension-types'; -import { ChainName } from '../currency-types'; +import { PnAddressBased } from '../extension-types.js'; +import { ChainName } from '../currency-types.js'; export { ACTION, IAddPaymentAddressParameters, IAddRefundAddressParameters, -} from './pn-any-address-based-types'; +} from './pn-any-address-based-types.js'; /** Manager of the extension */ export type IReferenceBased = diff --git a/packages/types/src/extensions/pn-any-stream-reference-based-types.ts b/packages/types/src/extensions/pn-any-stream-reference-based-types.ts index 11f929dee3..f86056caa2 100644 --- a/packages/types/src/extensions/pn-any-stream-reference-based-types.ts +++ b/packages/types/src/extensions/pn-any-stream-reference-based-types.ts @@ -1,9 +1,9 @@ -import { PnReferenceBased } from '../extension-types'; +import { PnReferenceBased } from '../extension-types.js'; export { ACTION, IAddPaymentAddressParameters, IAddRefundAddressParameters, -} from './pn-any-reference-based-types'; +} from './pn-any-reference-based-types.js'; /** Parameters for the creation action */ export type ICreationParameters = diff --git a/packages/types/src/extensions/pn-any-to-any-conversion-types.ts b/packages/types/src/extensions/pn-any-to-any-conversion-types.ts index 93460d3f7d..655f555816 100644 --- a/packages/types/src/extensions/pn-any-to-any-conversion-types.ts +++ b/packages/types/src/extensions/pn-any-to-any-conversion-types.ts @@ -1,10 +1,10 @@ -import { PnFeeReferenceBased } from '../extension-types'; -import { ChainName } from '../currency-types'; +import { PnFeeReferenceBased } from '../extension-types.js'; +import { ChainName } from '../currency-types.js'; export { IAddPaymentAddressParameters, IAddRefundAddressParameters, IAddFeeParameters, -} from './pn-any-fee-reference-based-types'; +} from './pn-any-fee-reference-based-types.js'; /** Conversion reference-based payment network extension interface */ export type IConversionReferenceBased = diff --git a/packages/types/src/extensions/pn-any-to-erc20-types.ts b/packages/types/src/extensions/pn-any-to-erc20-types.ts index 143c8619dc..0d2bb33c9f 100644 --- a/packages/types/src/extensions/pn-any-to-erc20-types.ts +++ b/packages/types/src/extensions/pn-any-to-erc20-types.ts @@ -1,5 +1,5 @@ -import * as PnAnyToAnyConversion from './pn-any-to-any-conversion-types'; -import { EvmChainName } from '../currency-types'; +import * as PnAnyToAnyConversion from './pn-any-to-any-conversion-types.js'; +import { EvmChainName } from '../currency-types.js'; /** Any to ERC20 reference-based payment network extension interface */ export type IAnyToERC20 = PnAnyToAnyConversion.IConversionReferenceBased; diff --git a/packages/types/src/extensions/pn-any-to-eth-types.ts b/packages/types/src/extensions/pn-any-to-eth-types.ts index d959aa995e..17239ea578 100644 --- a/packages/types/src/extensions/pn-any-to-eth-types.ts +++ b/packages/types/src/extensions/pn-any-to-eth-types.ts @@ -1,4 +1,4 @@ -import * as PnAnyToAnyConversion from './pn-any-to-any-conversion-types'; +import * as PnAnyToAnyConversion from './pn-any-to-any-conversion-types.js'; /** Any to ETH reference-based payment network extension interface */ export type IAnyToEth = PnAnyToAnyConversion.IConversionReferenceBased; diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 1554830bf0..bef493a213 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -1,21 +1,21 @@ -import * as AdvancedLogicTypes from './advanced-logic-types'; -import * as ClientTypes from './client-types'; -import * as CurrencyTypes from './currency-types'; -import * as DataAccessTypes from './data-access-types'; -import * as DecryptionProviderTypes from './decryption-provider-types'; -import * as EncryptionTypes from './encryption-types'; -import * as ExtensionTypes from './extension-types'; -import * as IdentityTypes from './identity-types'; -import * as LogTypes from './logger-types'; -import * as MultiFormatTypes from './multi-format-types'; -import * as PaymentTypes from './payment-types'; -import * as RequestLogicTypes from './request-logic-types'; -import * as SignatureProviderTypes from './signature-provider-types'; -import * as SignatureTypes from './signature-types'; -import * as StorageTypes from './storage-types'; -import * as TransactionTypes from './transaction-types'; -import * as TypesUtils from './utils'; -import * as FeeTypes from './fees-types'; +import * as AdvancedLogicTypes from './advanced-logic-types.js'; +import * as ClientTypes from './client-types.js'; +import * as CurrencyTypes from './currency-types.js'; +import * as DataAccessTypes from './data-access-types.js'; +import * as DecryptionProviderTypes from './decryption-provider-types.js'; +import * as EncryptionTypes from './encryption-types.js'; +import * as ExtensionTypes from './extension-types.js'; +import * as IdentityTypes from './identity-types.js'; +import * as LogTypes from './logger-types.js'; +import * as MultiFormatTypes from './multi-format-types.js'; +import * as PaymentTypes from './payment-types.js'; +import * as RequestLogicTypes from './request-logic-types.js'; +import * as SignatureProviderTypes from './signature-provider-types.js'; +import * as SignatureTypes from './signature-types.js'; +import * as StorageTypes from './storage-types.js'; +import * as TransactionTypes from './transaction-types.js'; +import * as TypesUtils from './utils.js'; +import * as FeeTypes from './fees-types.js'; export { AdvancedLogicTypes, diff --git a/packages/types/src/multi-format-types.ts b/packages/types/src/multi-format-types.ts index aef5771a91..0187984a66 100644 --- a/packages/types/src/multi-format-types.ts +++ b/packages/types/src/multi-format-types.ts @@ -1,5 +1,5 @@ -import * as HashTypes from './multi-format/hash-types'; -import * as PlainTypes from './multi-format/plain-types'; +import * as HashTypes from './multi-format/hash-types.js'; +import * as PlainTypes from './multi-format/plain-types.js'; export { HashTypes, PlainTypes }; diff --git a/packages/types/src/payment-types.ts b/packages/types/src/payment-types.ts index fb7ad00ff1..91651f006d 100644 --- a/packages/types/src/payment-types.ts +++ b/packages/types/src/payment-types.ts @@ -1,9 +1,9 @@ -import { IIdentity } from './identity-types'; -import * as RequestLogic from './request-logic-types'; -import * as ExtensionTypes from './extension-types'; -import { ICreationParameters } from './extensions/pn-any-declarative-types'; -import { ICreationParameters as ICreationParametersAnyToAny } from './extensions/pn-any-to-any-conversion-types'; -import { EvmChainName } from './currency-types'; +import { IIdentity } from './identity-types.js'; +import * as RequestLogic from './request-logic-types.js'; +import * as ExtensionTypes from './extension-types.js'; +import { ICreationParameters } from './extensions/pn-any-declarative-types.js'; +import { ICreationParameters as ICreationParametersAnyToAny } from './extensions/pn-any-to-any-conversion-types.js'; +import { EvmChainName } from './currency-types.js'; /** Interface for payment network extensions state and interpretation */ export interface IPaymentNetwork< diff --git a/packages/types/src/request-logic-types.ts b/packages/types/src/request-logic-types.ts index 3aea78052b..308c66ffbe 100644 --- a/packages/types/src/request-logic-types.ts +++ b/packages/types/src/request-logic-types.ts @@ -1,11 +1,11 @@ import { EventEmitter } from 'events'; -import * as Encryption from './encryption-types'; -import * as Extension from './extension-types'; -import * as Identity from './identity-types'; -import * as Signature from './signature-types'; -import * as Transaction from './transaction-types'; -import { CurrencyTypes } from './index'; +import * as Encryption from './encryption-types.js'; +import * as Extension from './extension-types.js'; +import * as Identity from './identity-types.js'; +import * as Signature from './signature-types.js'; +import * as Transaction from './transaction-types.js'; +import { CurrencyTypes } from './index.js'; /** Request Logic layer */ export interface IRequestLogic { diff --git a/packages/types/src/signature-provider-types.ts b/packages/types/src/signature-provider-types.ts index 041a25acd3..28beb3fe79 100644 --- a/packages/types/src/signature-provider-types.ts +++ b/packages/types/src/signature-provider-types.ts @@ -1,5 +1,5 @@ -import * as Identity from './identity-types'; -import * as Signature from './signature-types'; +import * as Identity from './identity-types.js'; +import * as Signature from './signature-types.js'; /** Signature provider interface */ export interface ISignatureProvider { diff --git a/packages/types/src/transaction-types.ts b/packages/types/src/transaction-types.ts index 04e55f7d58..983acf674c 100644 --- a/packages/types/src/transaction-types.ts +++ b/packages/types/src/transaction-types.ts @@ -1,5 +1,5 @@ import { EventEmitter } from 'events'; -import * as Encryption from './encryption-types'; +import * as Encryption from './encryption-types.js'; /** Transaction Manager interface */ export interface ITransactionManager { diff --git a/packages/types/src/utils.ts b/packages/types/src/utils.ts index e28b738080..23e9e2f038 100644 --- a/packages/types/src/utils.ts +++ b/packages/types/src/utils.ts @@ -1,9 +1,9 @@ -import * as ExtensionTypes from './extension-types'; +import * as ExtensionTypes from './extension-types.js'; import { ICreationParameters, IOriginalRequestCreationParameters, ISubsequentRequestCreationParameters, -} from './extensions/pn-any-stream-reference-based-types'; +} from './extensions/pn-any-stream-reference-based-types.js'; /** * Types a value like ExtensionType into a paymentNetworkID enum element if possible diff --git a/packages/usage-examples/package.json b/packages/usage-examples/package.json index 04e329c036..0c3f12e472 100644 --- a/packages/usage-examples/package.json +++ b/packages/usage-examples/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/usage-examples", "version": "0.24.0", + "type": "module", "private": true, "description": "Usage examples of Request Network.", "keywords": [ diff --git a/packages/usage-examples/src/request-client-js-add-stakeholders.ts b/packages/usage-examples/src/request-client-js-add-stakeholders.ts index 0095bca8a4..fe50b349cc 100644 --- a/packages/usage-examples/src/request-client-js-add-stakeholders.ts +++ b/packages/usage-examples/src/request-client-js-add-stakeholders.ts @@ -1,8 +1,8 @@ import { EthereumPrivateKeyDecryptionProvider } from '@requestnetwork/epk-decryption'; import { EthereumPrivateKeySignatureProvider } from '@requestnetwork/epk-signature'; import * as RequestNetwork from '@requestnetwork/request-client.js'; -import MockStorage from '../../request-client.js/dist/mock-storage'; -import MockDataAccess from '../../request-client.js/dist/mock-data-access'; +import MockStorage from '../../request-client.js/dist/mock-storage.js'; +import MockDataAccess from '../../request-client.js/dist/mock-data-access.js'; // payee information const payeeSignatureInfo = { diff --git a/packages/usage-examples/src/request-logic-add-stakeholder.ts b/packages/usage-examples/src/request-logic-add-stakeholder.ts index 992ebe81e8..56c96465c1 100644 --- a/packages/usage-examples/src/request-logic-add-stakeholder.ts +++ b/packages/usage-examples/src/request-logic-add-stakeholder.ts @@ -13,7 +13,7 @@ import { TransactionTypes, } from '@requestnetwork/types'; -import MockStorage from './mock/mock-storage'; +import MockStorage from './mock/mock-storage.js'; const createParams = { currency: { diff --git a/packages/usage-examples/src/request-logic-clear-request.ts b/packages/usage-examples/src/request-logic-clear-request.ts index 674f033911..84a0462049 100644 --- a/packages/usage-examples/src/request-logic-clear-request.ts +++ b/packages/usage-examples/src/request-logic-clear-request.ts @@ -10,7 +10,7 @@ import { TransactionTypes, } from '@requestnetwork/types'; -import MockStorage from './mock/mock-storage'; +import MockStorage from './mock/mock-storage.js'; const createParams = { currency: { diff --git a/packages/usage-examples/src/request-logic-encrypted-request.ts b/packages/usage-examples/src/request-logic-encrypted-request.ts index afdb9f016f..5b922ef874 100644 --- a/packages/usage-examples/src/request-logic-encrypted-request.ts +++ b/packages/usage-examples/src/request-logic-encrypted-request.ts @@ -13,7 +13,7 @@ import { TransactionTypes, } from '@requestnetwork/types'; -import MockStorage from './mock/mock-storage'; +import MockStorage from './mock/mock-storage.js'; const createParams = { currency: { diff --git a/packages/utils/package.json b/packages/utils/package.json index 337b42ad32..b7fbc28d36 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/utils", "version": "0.37.0", + "type": "module", "publishConfig": { "access": "public" }, diff --git a/packages/utils/src/amount.ts b/packages/utils/src/amount.ts index b78f36bb40..99ab27db90 100644 --- a/packages/utils/src/amount.ts +++ b/packages/utils/src/amount.ts @@ -1,5 +1,5 @@ import { RequestLogicTypes } from '@requestnetwork/types'; -import { isString } from './utils'; +import { isString } from './utils.js'; import { BigNumber } from 'ethers'; diff --git a/packages/utils/src/crypto.ts b/packages/utils/src/crypto.ts index bc99fa3769..8a34a6e980 100644 --- a/packages/utils/src/crypto.ts +++ b/packages/utils/src/crypto.ts @@ -6,7 +6,7 @@ import { encryptWithAes256cbc, encryptWithAes256gcm, random32Bytes, -} from './crypto/crypto-wrapper'; +} from './crypto/crypto-wrapper.js'; import { ecDecrypt, ecEncrypt, @@ -14,8 +14,8 @@ import { getAddressFromPublicKey, ecRecover, ecSign, -} from './crypto/ec-utils'; -import { deepSort } from './utils'; +} from './crypto/ec-utils.js'; +import { deepSort } from './utils.js'; /** * manages crypto functions diff --git a/packages/utils/src/encryption.ts b/packages/utils/src/encryption.ts index 746c917b33..0661fab255 100644 --- a/packages/utils/src/encryption.ts +++ b/packages/utils/src/encryption.ts @@ -7,7 +7,7 @@ import { encryptWithAes256cbc, encryptWithAes256gcm, getAddressFromPublicKey, -} from './index'; +} from './index.js'; /** * Functions to manage encryption diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 915a32c2d7..e053626feb 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -2,11 +2,11 @@ * Collection of general purpose utility function */ -export { addAmount, isValidAmount, reduceAmount } from './amount'; +export { addAmount, isValidAmount, reduceAmount } from './amount.js'; -export { minBigNumber, maxBigNumber } from './bignumber'; +export { minBigNumber, maxBigNumber } from './bignumber.js'; -export { cachedThrottle } from './cached-throttle'; +export { cachedThrottle } from './cached-throttle.js'; export { decryptWithAes256cbc, @@ -26,18 +26,18 @@ export { last20bytesOfNormalizedKeccak256Hash, normalize, normalizeKeccak256Hash, -} from './crypto'; +} from './crypto.js'; -export { decrypt, encrypt, getIdentityFromEncryptionParams } from './encryption'; +export { decrypt, encrypt, getIdentityFromEncryptionParams } from './encryption.js'; -export { normalizeGasFees } from './normalize-gas-fees'; +export { normalizeGasFees } from './normalize-gas-fees.js'; export { areEqualIdentities, identityHasError, normalizeIdentityValue, supportedIdentities, -} from './identity'; +} from './identity.js'; export { setProviderFactory, @@ -46,13 +46,13 @@ export { getDefaultProvider, getCeloProvider, networkRpcs, -} from './providers'; +} from './providers.js'; -export { retry } from './retry'; +export { retry } from './retry.js'; -export { getIdentityFromSignatureParams, recoverSigner, sign } from './signature'; +export { getIdentityFromSignatureParams, recoverSigner, sign } from './signature.js'; -export { SimpleLogger } from './simple-logger'; +export { SimpleLogger } from './simple-logger.js'; export { deepCopy, @@ -64,4 +64,4 @@ export { unique, uniqueByProperty, notNull, -} from './utils'; +} from './utils.js'; diff --git a/packages/utils/src/normalize-gas-fees.ts b/packages/utils/src/normalize-gas-fees.ts index 24a6c960b6..3e7324d173 100644 --- a/packages/utils/src/normalize-gas-fees.ts +++ b/packages/utils/src/normalize-gas-fees.ts @@ -1,6 +1,6 @@ import { BigNumber, constants } from 'ethers'; -import { maxBigNumber } from './index'; +import { maxBigNumber } from './index.js'; import { LogTypes, FeeTypes } from '@requestnetwork/types'; /** diff --git a/packages/utils/src/signature.ts b/packages/utils/src/signature.ts index 8692088108..0181e17b01 100644 --- a/packages/utils/src/signature.ts +++ b/packages/utils/src/signature.ts @@ -6,7 +6,7 @@ import { getAddressFromPrivateKey, normalize, normalizeKeccak256Hash, -} from './crypto'; +} from './crypto.js'; /** * Function to manage Request Logic Signature diff --git a/packages/utils/src/utils.ts b/packages/utils/src/utils.ts index f512a539ed..d615f944a9 100644 --- a/packages/utils/src/utils.ts +++ b/packages/utils/src/utils.ts @@ -1,4 +1,4 @@ -import { normalizeKeccak256Hash } from './crypto'; +import { normalizeKeccak256Hash } from './crypto.js'; /** * Collection of general purpose utility function diff --git a/packages/utils/test/amount.test.ts b/packages/utils/test/amount.test.ts index d13cd746ac..3147faba88 100644 --- a/packages/utils/test/amount.test.ts +++ b/packages/utils/test/amount.test.ts @@ -1,6 +1,6 @@ import { BigNumber } from 'ethers'; -import { addAmount, isValidAmount, reduceAmount } from '../src'; +import { addAmount, isValidAmount, reduceAmount } from '../src/index.js'; const magicIntegerSmall = 10000; const magicIntegerBig = 1000000000000000000000000000000; diff --git a/packages/utils/test/bignumber.test.ts b/packages/utils/test/bignumber.test.ts index 1b2a9c907b..d5bb51366f 100644 --- a/packages/utils/test/bignumber.test.ts +++ b/packages/utils/test/bignumber.test.ts @@ -1,5 +1,5 @@ import { BigNumber } from '@ethersproject/bignumber'; -import { maxBigNumber, minBigNumber } from '../src'; +import { maxBigNumber, minBigNumber } from '../src/index.js'; describe('min', () => { it('returns the min of 2 big numbers', () => { diff --git a/packages/utils/test/cached-thottle.test.ts b/packages/utils/test/cached-thottle.test.ts index fed1d7b67f..d73c4ecf7c 100644 --- a/packages/utils/test/cached-thottle.test.ts +++ b/packages/utils/test/cached-thottle.test.ts @@ -1,5 +1,5 @@ /* eslint-disable no-magic-numbers */ -import { cachedThrottle } from '../src'; +import { cachedThrottle } from '../src/index.js'; describe('Cached Throttle', () => { it('throttles a function', async () => { diff --git a/packages/utils/test/crypto.test.ts b/packages/utils/test/crypto.test.ts index 4647b33e23..d08d39636c 100644 --- a/packages/utils/test/crypto.test.ts +++ b/packages/utils/test/crypto.test.ts @@ -5,7 +5,7 @@ import { last20bytesOfNormalizedKeccak256Hash, normalize, normalizeKeccak256Hash, -} from '../src'; +} from '../src/index.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ describe('Utils/crypto', () => { diff --git a/packages/utils/test/crypto/crypto-wrapper.test.ts b/packages/utils/test/crypto/crypto-wrapper.test.ts index d794d39ec9..0bb897bf84 100644 --- a/packages/utils/test/crypto/crypto-wrapper.test.ts +++ b/packages/utils/test/crypto/crypto-wrapper.test.ts @@ -5,7 +5,7 @@ import { encryptWithAes256gcm, random32Bytes, unique, -} from '../../src'; +} from '../../src/index.js'; const anyData = 'this is any data!'; const arbitraryKey = '12345678901234567890123456789012'; diff --git a/packages/utils/test/crypto/ec-utils.test.ts b/packages/utils/test/crypto/ec-utils.test.ts index 41d68b4916..b7ba0512af 100644 --- a/packages/utils/test/crypto/ec-utils.test.ts +++ b/packages/utils/test/crypto/ec-utils.test.ts @@ -5,7 +5,7 @@ import { ecSign, getAddressFromPrivateKey, getAddressFromPublicKey, -} from '../../src'; +} from '../../src/index.js'; const rawId = { address: '0x818B6337657A23F58581715Fc610577292e521D0', diff --git a/packages/utils/test/encryption.test.ts b/packages/utils/test/encryption.test.ts index dd6bfaaa14..3c422fbc2e 100644 --- a/packages/utils/test/encryption.test.ts +++ b/packages/utils/test/encryption.test.ts @@ -1,5 +1,5 @@ import { EncryptionTypes, IdentityTypes } from '@requestnetwork/types'; -import { getIdentityFromEncryptionParams, encrypt, decrypt } from '../src'; +import { getIdentityFromEncryptionParams, encrypt, decrypt } from '../src/index.js'; const otherIdRaw = { address: '0x818B6337657A23F58581715Fc610577292e521D0', diff --git a/packages/utils/test/identity.test.ts b/packages/utils/test/identity.test.ts index 17462f1eae..674112ffc5 100644 --- a/packages/utils/test/identity.test.ts +++ b/packages/utils/test/identity.test.ts @@ -1,5 +1,5 @@ import { IdentityTypes } from '@requestnetwork/types'; -import { areEqualIdentities, normalizeIdentityValue } from '../src'; +import { areEqualIdentities, normalizeIdentityValue } from '../src/index.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ describe('Identity', () => { diff --git a/packages/utils/test/retry.test.ts b/packages/utils/test/retry.test.ts index 8a3a2632f6..fc6dfcca4d 100644 --- a/packages/utils/test/retry.test.ts +++ b/packages/utils/test/retry.test.ts @@ -1,4 +1,4 @@ -import { retry } from '../src'; +import { retry } from '../src/index.js'; class TestClass { private value = 'private'; diff --git a/packages/utils/test/signature.test.ts b/packages/utils/test/signature.test.ts index bbf3c166b6..f1549540ad 100644 --- a/packages/utils/test/signature.test.ts +++ b/packages/utils/test/signature.test.ts @@ -4,7 +4,7 @@ import { normalizeKeccak256Hash, recoverSigner, sign, -} from '../src'; +} from '../src/index.js'; const otherIdRaw = { address: '0x818B6337657A23F58581715Fc610577292e521D0', diff --git a/packages/utils/test/simple-logger.test.ts b/packages/utils/test/simple-logger.test.ts index 245026c054..33786551be 100644 --- a/packages/utils/test/simple-logger.test.ts +++ b/packages/utils/test/simple-logger.test.ts @@ -1,5 +1,5 @@ import { LogTypes } from '@requestnetwork/types'; -import { SimpleLogger } from '../src'; +import { SimpleLogger } from '../src/index.js'; const LogLevel = LogTypes.LogLevel; diff --git a/packages/utils/test/utils.test.ts b/packages/utils/test/utils.test.ts index 6177dedb78..e9c300b275 100644 --- a/packages/utils/test/utils.test.ts +++ b/packages/utils/test/utils.test.ts @@ -7,7 +7,7 @@ import { timeoutPromise, unique, uniqueByProperty, -} from '../src'; +} from '../src/index.js'; /* eslint-disable @typescript-eslint/no-unused-expressions */ describe('Utils', () => { diff --git a/packages/web3-signature/package.json b/packages/web3-signature/package.json index 64b4cfa208..43525764ae 100644 --- a/packages/web3-signature/package.json +++ b/packages/web3-signature/package.json @@ -1,6 +1,7 @@ { "name": "@requestnetwork/web3-signature", "version": "0.4.37", + "type": "module", "publishConfig": { "access": "public" }, @@ -31,7 +32,7 @@ "dist" ], "scripts": { - "build": "run-s build:commonjs build:umd", + "build": "run-s build:commonjs", "build:commonjs": "tsc -b tsconfig.build.json", "build:umd": "webpack", "clean": "shx rm -rf dist tsconfig.tsbuildinfo tsconfig.build.tsbuildinfo", diff --git a/packages/web3-signature/src/index.ts b/packages/web3-signature/src/index.ts index 1421b06671..bcdfbd5090 100644 --- a/packages/web3-signature/src/index.ts +++ b/packages/web3-signature/src/index.ts @@ -1 +1 @@ -export { default as Web3SignatureProvider } from './web3-signature-provider'; +export { default as Web3SignatureProvider } from './web3-signature-provider.js'; diff --git a/packages/web3-signature/test/web3-signature-provider.test.ts b/packages/web3-signature/test/web3-signature-provider.test.ts index 280e75d2ad..344d3d5a30 100644 --- a/packages/web3-signature/test/web3-signature-provider.test.ts +++ b/packages/web3-signature/test/web3-signature-provider.test.ts @@ -1,6 +1,6 @@ import { IdentityTypes, SignatureTypes } from '@requestnetwork/types'; -import Web3SignatureProvider from '../src/web3-signature-provider'; +import Web3SignatureProvider from '../src/web3-signature-provider.js'; import { ecSign, normalizeKeccak256Hash } from '@requestnetwork/utils'; diff --git a/tsconfig.json b/tsconfig.json index e9f2a27f4b..83d45bd526 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "target": "es2015", - "module": "commonjs", + "module": "node16", "importHelpers": true, "composite": true, "declaration": true, @@ -10,7 +10,7 @@ "strict": true, "baseUrl": "./packages", "skipLibCheck": true, - "moduleResolution": "node", + "moduleResolution": "node16", "resolveJsonModule": true, "useUnknownInCatchVariables": false, "lib": ["es2018"] diff --git a/yarn.lock b/yarn.lock index 6a035aead1..ec079ffbf0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4141,59 +4141,6 @@ web3 "^1.2.1" web3-utils "^1.2.1" -"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": - version "1.1.2" - resolved "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz" - integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78= - -"@protobufjs/base64@^1.1.2": - version "1.1.2" - resolved "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz" - integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== - -"@protobufjs/codegen@^2.0.4": - version "2.0.4" - resolved "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz" - integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== - -"@protobufjs/eventemitter@^1.1.0": - version "1.1.0" - resolved "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz" - integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A= - -"@protobufjs/fetch@^1.1.0": - version "1.1.0" - resolved "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz" - integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU= - dependencies: - "@protobufjs/aspromise" "^1.1.1" - "@protobufjs/inquire" "^1.1.0" - -"@protobufjs/float@^1.0.2": - version "1.0.2" - resolved "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz" - integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E= - -"@protobufjs/inquire@^1.1.0": - version "1.1.0" - resolved "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz" - integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik= - -"@protobufjs/path@^1.1.2": - version "1.1.2" - resolved "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz" - integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= - -"@protobufjs/pool@^1.1.0": - version "1.1.0" - resolved "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz" - integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q= - -"@protobufjs/utf8@^1.1.0": - version "1.1.0" - resolved "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz" - integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= - "@rainbow-me/fee-suggestions@2.1.0": version "2.1.0" resolved "https://registry.npmjs.org/@rainbow-me/fee-suggestions/-/fee-suggestions-2.1.0.tgz" @@ -4992,11 +4939,6 @@ resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz" integrity sha512-EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA== -"@types/long@^4.0.1": - version "4.0.2" - resolved "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz" - integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA== - "@types/lru-cache@^5.1.0": version "5.1.1" resolved "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz" @@ -5057,11 +4999,6 @@ resolved "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz" integrity sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw== -"@types/node@>=13.7.0": - version "17.0.31" - resolved "https://registry.npmjs.org/@types/node/-/node-17.0.31.tgz" - integrity sha512-AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q== - "@types/node@^10.12.18", "@types/node@^10.3.2": version "10.17.55" resolved "https://registry.npmjs.org/@types/node/-/node-10.17.55.tgz" @@ -6220,13 +6157,14 @@ axios-mock-adapter@1.19.0: fast-deep-equal "^3.1.3" is-buffer "^2.0.3" -axios@0.27.2: - version "0.27.2" - resolved "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz" - integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== +axios@1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.5.1.tgz#11fbaa11fc35f431193a9564109c88c1f27b585f" + integrity sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A== dependencies: - follow-redirects "^1.14.9" + follow-redirects "^1.15.0" form-data "^4.0.0" + proxy-from-env "^1.1.0" babel-code-frame@^6.26.0: version "6.26.0" @@ -9635,10 +9573,10 @@ dot@^1.1.3: resolved "https://registry.npmjs.org/dot/-/dot-1.1.3.tgz" integrity sha512-/nt74Rm+PcfnirXGEdhZleTwGC2LMnuKTeeTIlI82xb5loBBoXNYzr2ezCroPSMtilK8EZIfcNZwOcHN+ib1Lg== -dotenv@10.0.0: - version "10.0.0" - resolved "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz" - integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== +dotenv@16.3.1: + version "16.3.1" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e" + integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ== dotenv@8.2.0: version "8.2.0" @@ -11832,10 +11770,10 @@ follow-redirects@^1.12.1: resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz" integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== -follow-redirects@^1.14.9: - version "1.15.1" - resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz" - integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== +follow-redirects@^1.15.0: + version "1.15.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" + integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== fontkit@^1.8.0: version "1.8.1" @@ -13447,13 +13385,14 @@ ipaddr.js@1.9.1: resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== -ipfs-unixfs@6.0.7: - version "6.0.7" - resolved "https://registry.npmjs.org/ipfs-unixfs/-/ipfs-unixfs-6.0.7.tgz" - integrity sha512-5mKbQgvux6n5lQ+upGWWPKcoswXahdOcyGQ2SbIIRV6eBJMzxLprzKsyb0GMsg80tHX2wnNOxBKSCiSGjb+54A== +ipfs-unixfs@11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/ipfs-unixfs/-/ipfs-unixfs-11.1.0.tgz#f8e3e0b52182b74e56327bd2952f5f9ac936f5fa" + integrity sha512-Lq37nKLJOpRFjx3rcg3y+ZwUxBX7jluKfIt5UPp6wb1L3dP0sj1yaLR0Yg2CdGYvHWyUpZD1iTnT8upL0ToDOw== dependencies: err-code "^3.0.1" - protobufjs "^6.10.2" + protons-runtime "^5.0.0" + uint8arraylist "^2.4.3" irregular-plurals@^3.2.0: version "3.2.0" @@ -15547,11 +15486,6 @@ loglevel@^1.6.4: resolved "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz" integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== -long@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/long/-/long-4.0.0.tgz" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== - looper@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/looper/-/looper-2.0.0.tgz" @@ -16483,6 +16417,11 @@ multicoin-address-validator@0.5.12: lodash.isequal "^4.5.0" minify "^6.0.1" +multiformats@^12.0.1: + version "12.1.2" + resolved "https://registry.yarnpkg.com/multiformats/-/multiformats-12.1.2.tgz#eef67872da3f34b9a4a7ca7dd1ffdf3074f5c517" + integrity sha512-6mRIsrZXyw5xNPO31IGBMmxgDXBSgCGDsBAtazkZ02ip4hMwZNrQvfxXZtytRoBSWuzSq5f9VmMnXj76fIz5FQ== + multihashes@^0.4.15, multihashes@~0.4.15: version "0.4.21" resolved "https://registry.npmjs.org/multihashes/-/multihashes-0.4.21.tgz" @@ -18166,25 +18105,6 @@ proto-list@~1.2.1: resolved "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= -protobufjs@^6.10.2: - version "6.11.4" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa" - integrity sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw== - dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.1" - "@types/node" ">=13.7.0" - long "^4.0.0" - protocols@^1.1.0, protocols@^1.4.0: version "1.4.8" resolved "https://registry.npmjs.org/protocols/-/protocols-1.4.8.tgz" @@ -18197,6 +18117,14 @@ protoduck@^5.0.1: dependencies: genfun "^5.0.0" +protons-runtime@^5.0.0: + version "5.0.5" + resolved "https://registry.yarnpkg.com/protons-runtime/-/protons-runtime-5.0.5.tgz#2f1f754061233d1c1787badc2a83176c1b069058" + integrity sha512-Sx33HMiA5w1ZxmfkfURnesrKKnyaHKIQuY0aOVfdKWZ00v/ssxZe3sdn7niUr22OTaCsFZF2nGYidjHMHHBuTg== + dependencies: + uint8arraylist "^2.4.3" + uint8arrays "^4.0.6" + proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz" @@ -18205,6 +18133,11 @@ proxy-addr@~2.0.7: forwarded "0.2.0" ipaddr.js "1.9.1" +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + proxy-middleware@latest: version "0.15.0" resolved "https://registry.yarnpkg.com/proxy-middleware/-/proxy-middleware-0.15.0.tgz#a3fdf1befb730f951965872ac2f6074c61477a56" @@ -20967,6 +20900,11 @@ tiny-inflate@^1.0.0, tiny-inflate@^1.0.2: resolved "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz" integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw== +tiny-typed-emitter@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz#b3b027fdd389ff81a152c8e847ee2f5be9fad7b5" + integrity sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA== + title-case@^2.1.0: version "2.1.1" resolved "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz" @@ -21500,11 +21438,6 @@ typechain@^3.0.0: ts-essentials "^6.0.3" ts-generator "^0.1.1" -typed-emitter@1.4.0: - version "1.4.0" - resolved "https://registry.npmjs.org/typed-emitter/-/typed-emitter-1.4.0.tgz" - integrity sha512-weBmoo3HhpKGgLBOYwe8EB31CzDFuaK7CCL+axXhUYhn4jo6DSkHnbefboCF5i4DQ2aMFe0C/FdTWcPdObgHyg== - typedarray-to-buffer@^3.1.5: version "3.1.5" resolved "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz" @@ -21579,6 +21512,20 @@ uid-number@0.0.6: resolved "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz" integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE= +uint8arraylist@^2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/uint8arraylist/-/uint8arraylist-2.4.3.tgz#1148aa979b407d382e4eb8d9c8f2b4bf3f5910d5" + integrity sha512-oEVZr4/GrH87K0kjNce6z8pSCzLEPqHNLNR5sj8cJOySrTP8Vb/pMIbZKLJGhQKxm1TiZ31atNrpn820Pyqpow== + dependencies: + uint8arrays "^4.0.2" + +uint8arrays@^4.0.2, uint8arrays@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-4.0.6.tgz#bae68b536c2e87147045b95d73d29e503e45ecab" + integrity sha512-4ZesjQhqOU2Ip6GPReIwN60wRxIupavL8T0Iy36BBHr2qyMrNxsPJvr7vpS4eFt8F8kSguWUPad6ZM9izs/vyw== + dependencies: + multiformats "^12.0.1" + ultron@~1.1.0: version "1.1.1" resolved "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"