From 26b80fe3d163eacb4c44a083a4ab5d75117b8ee0 Mon Sep 17 00:00:00 2001 From: Benjamin Levesque <14175665+benjlevesque@users.noreply.github.com> Date: Wed, 4 Oct 2023 15:25:05 +0200 Subject: [PATCH] fix import paths --- .../payment-processor/src/payment/erc20-escrow-payment.ts | 2 +- packages/smart-contracts/scripts/conversion-proxy.ts | 2 +- packages/smart-contracts/scripts/deploy-payments.ts | 4 ++-- packages/smart-contracts/scripts/erc20-swap-to-conversion.ts | 2 +- .../src/lib/artifacts/BatchConversionPayments/index.ts | 2 +- .../src/lib/artifacts/BatchNoConversionPayments/index.ts | 2 +- .../smart-contracts/src/lib/artifacts/BatchPayments/index.ts | 2 +- .../src/lib/artifacts/ChainlinkConversionPath/index.ts | 2 +- .../src/lib/artifacts/ERC20EscrowToPay/index.ts | 2 +- .../smart-contracts/src/lib/artifacts/ERC20FeeProxy/index.ts | 2 +- .../smart-contracts/src/lib/artifacts/ERC20Proxy/index.ts | 2 +- .../smart-contracts/src/lib/artifacts/ERC20SwapToPay/index.ts | 2 +- .../src/lib/artifacts/ERC20TransferableReceivable/index.ts | 2 +- .../src/lib/artifacts/Erc20ConversionProxy/index.ts | 2 +- .../src/lib/artifacts/Erc20SwapConversion/index.ts | 2 +- .../src/lib/artifacts/EthConversionProxy/index.ts | 2 +- .../src/lib/artifacts/EthereumFeeProxy/index.ts | 2 +- .../smart-contracts/src/lib/artifacts/EthereumProxy/index.ts | 2 +- .../src/lib/artifacts/RequestDeployer/index.ts | 2 +- .../src/lib/artifacts/RequestHashStorage/index.ts | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/payment-processor/src/payment/erc20-escrow-payment.ts b/packages/payment-processor/src/payment/erc20-escrow-payment.ts index 9745b483ab..4652b307be 100644 --- a/packages/payment-processor/src/payment/erc20-escrow-payment.ts +++ b/packages/payment-processor/src/payment/erc20-escrow-payment.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ import { BigNumber, BigNumberish, constants, ContractTransaction, providers, Signer } from 'ethers'; import { erc20EscrowToPayArtifact } from '@requestnetwork/smart-contracts'; -import { ERC20EscrowToPay__factory } from '@requestnetwork/smart-contracts/types/'; +import { ERC20EscrowToPay__factory } from '@requestnetwork/smart-contracts/types'; import { ClientTypes, ExtensionTypes } from '@requestnetwork/types'; import { getAmountToPay, diff --git a/packages/smart-contracts/scripts/conversion-proxy.ts b/packages/smart-contracts/scripts/conversion-proxy.ts index 682cdd151e..287cd12647 100644 --- a/packages/smart-contracts/scripts/conversion-proxy.ts +++ b/packages/smart-contracts/scripts/conversion-proxy.ts @@ -1,7 +1,7 @@ import { HardhatRuntimeEnvironment } from 'hardhat/types'; // eslint-disable-next-line // @ts-ignore Cannot find module -import { Erc20ConversionProxy } from '../src/types/Erc20ConversionProxy'; +import { Erc20ConversionProxy } from '../src/types'; import { erc20ConversionProxy as erc20ConversionProxyArtifact, ethConversionArtifact, diff --git a/packages/smart-contracts/scripts/deploy-payments.ts b/packages/smart-contracts/scripts/deploy-payments.ts index d760243b1c..0b12f7a15d 100644 --- a/packages/smart-contracts/scripts/deploy-payments.ts +++ b/packages/smart-contracts/scripts/deploy-payments.ts @@ -10,10 +10,10 @@ import { uniswapV2RouterAddresses, jumpToNonce } from './utils'; import { Contract } from 'ethers'; // eslint-disable-next-line // @ts-ignore Cannot find module -import { ChainlinkConversionPath } from '../src/types/ChainlinkConversionPath'; +import { ChainlinkConversionPath } from '../src/types'; // eslint-disable-next-line // @ts-ignore Cannot find module -import { EthConversionProxy } from '../src/types/EthConversionProxy'; +import { EthConversionProxy } from '../src/types'; import { CurrencyManager } from '@requestnetwork/currency'; import { RequestLogicTypes } from '@requestnetwork/types'; import { HardhatRuntimeEnvironmentExtended } from '../scripts-create2/types'; diff --git a/packages/smart-contracts/scripts/erc20-swap-to-conversion.ts b/packages/smart-contracts/scripts/erc20-swap-to-conversion.ts index d9dc36afbe..3da11879ae 100644 --- a/packages/smart-contracts/scripts/erc20-swap-to-conversion.ts +++ b/packages/smart-contracts/scripts/erc20-swap-to-conversion.ts @@ -1,7 +1,7 @@ import { HardhatRuntimeEnvironment } from 'hardhat/types'; // eslint-disable-next-line // @ts-ignore Cannot find module -import { ERC20SwapToConversion } from '../src/types/ERC20SwapToConversion'; +import { ERC20SwapToConversion } from '../src/types'; import { erc20SwapConversionArtifact } from '../src/lib'; import { DeploymentResult, deployOne } from './deploy-one'; import { uniswapV2RouterAddresses } from './utils'; diff --git a/packages/smart-contracts/src/lib/artifacts/BatchConversionPayments/index.ts b/packages/smart-contracts/src/lib/artifacts/BatchConversionPayments/index.ts index 77c67a449a..1dc0a289f4 100644 --- a/packages/smart-contracts/src/lib/artifacts/BatchConversionPayments/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/BatchConversionPayments/index.ts @@ -2,7 +2,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; // @ts-ignore Cannot find module -import type { BatchConversionPayments } from '../../../types/BatchConversionPayments'; +import type { BatchConversionPayments } from '../../../types'; export const batchConversionPaymentsArtifact = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/BatchNoConversionPayments/index.ts b/packages/smart-contracts/src/lib/artifacts/BatchNoConversionPayments/index.ts index 6737cd2abb..b9dd636d46 100644 --- a/packages/smart-contracts/src/lib/artifacts/BatchNoConversionPayments/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/BatchNoConversionPayments/index.ts @@ -2,7 +2,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; // @ts-ignore Cannot find module -import type { BatchNoConversionPayments } from '../../../types/BatchNoConversionPayments'; +import type { BatchNoConversionPayments } from '../../../types'; export const batchNoConversionPaymentsArtifact = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/BatchPayments/index.ts b/packages/smart-contracts/src/lib/artifacts/BatchPayments/index.ts index 352f758539..055e7e5ebd 100644 --- a/packages/smart-contracts/src/lib/artifacts/BatchPayments/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/BatchPayments/index.ts @@ -2,7 +2,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; // @ts-ignore Cannot find module -import type { BatchPayments } from '../../../types/BatchPayments'; +import type { BatchPayments } from '../../../types'; export const batchPaymentsArtifact = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/ChainlinkConversionPath/index.ts b/packages/smart-contracts/src/lib/artifacts/ChainlinkConversionPath/index.ts index 9e9be55406..ea2f6e6730 100644 --- a/packages/smart-contracts/src/lib/artifacts/ChainlinkConversionPath/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/ChainlinkConversionPath/index.ts @@ -3,7 +3,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; import { abi as ABI_0_2_0 } from './0.2.0.json'; // @ts-ignore Cannot find module -import type { ChainlinkConversionPath } from '../../../types/ChainlinkConversionPath'; +import type { ChainlinkConversionPath } from '../../../types'; export const chainlinkConversionPath = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/ERC20EscrowToPay/index.ts b/packages/smart-contracts/src/lib/artifacts/ERC20EscrowToPay/index.ts index cfecfdf31f..4069ecc30b 100644 --- a/packages/smart-contracts/src/lib/artifacts/ERC20EscrowToPay/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/ERC20EscrowToPay/index.ts @@ -2,7 +2,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; // @ts-ignore Cannot find module -import type { ERC20EscrowToPay } from '../../../types/ERC2EscrowToPay'; +import type { ERC20EscrowToPay } from '../../../types'; export const erc20EscrowToPayArtifact = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/ERC20FeeProxy/index.ts b/packages/smart-contracts/src/lib/artifacts/ERC20FeeProxy/index.ts index 9b0653e0a3..8c23cbafa0 100644 --- a/packages/smart-contracts/src/lib/artifacts/ERC20FeeProxy/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/ERC20FeeProxy/index.ts @@ -2,7 +2,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; // @ts-ignore Cannot find module -import type { ERC20FeeProxy } from '../../../types/ERC20FeeProxy'; +import type { ERC20FeeProxy } from '../../../types'; export const erc20FeeProxyArtifact = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/ERC20Proxy/index.ts b/packages/smart-contracts/src/lib/artifacts/ERC20Proxy/index.ts index 160cf664ab..5398f2c207 100644 --- a/packages/smart-contracts/src/lib/artifacts/ERC20Proxy/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/ERC20Proxy/index.ts @@ -2,7 +2,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; // @ts-ignore Cannot find module -import type { ERC20Proxy } from '../../../types/ERC20Proxy'; +import type { ERC20Proxy } from '../../../types'; export const erc20ProxyArtifact = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/ERC20SwapToPay/index.ts b/packages/smart-contracts/src/lib/artifacts/ERC20SwapToPay/index.ts index fba9aa99db..d924259bee 100644 --- a/packages/smart-contracts/src/lib/artifacts/ERC20SwapToPay/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/ERC20SwapToPay/index.ts @@ -3,7 +3,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; import { abi as ABI_0_2_0 } from './0.2.0.json'; // @ts-ignore Cannot find module -import type { ERC20SwapToPay } from '../../../types/ERC20SwapToPay'; +import type { ERC20SwapToPay } from '../../../types'; export const erc20SwapToPayArtifact = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/ERC20TransferableReceivable/index.ts b/packages/smart-contracts/src/lib/artifacts/ERC20TransferableReceivable/index.ts index 73fdd87f88..ea9cc032ff 100644 --- a/packages/smart-contracts/src/lib/artifacts/ERC20TransferableReceivable/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/ERC20TransferableReceivable/index.ts @@ -3,7 +3,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; import { abi as ABI_0_2_0 } from './0.2.0.json'; // @ts-ignore Cannot find module -import type { ERC20TransferableReceivable } from '../../../types/ERC20TransferableReceivable'; +import type { ERC20TransferableReceivable } from '../../../types'; export const erc20TransferableReceivableArtifact = new ContractArtifact( diff --git a/packages/smart-contracts/src/lib/artifacts/Erc20ConversionProxy/index.ts b/packages/smart-contracts/src/lib/artifacts/Erc20ConversionProxy/index.ts index bb0970fbe7..e9799f017d 100644 --- a/packages/smart-contracts/src/lib/artifacts/Erc20ConversionProxy/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/Erc20ConversionProxy/index.ts @@ -3,7 +3,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; import { abi as ABI_0_1_1 } from './0.1.1.json'; // @ts-ignore Cannot find module -import type { Erc20ConversionProxy } from '../../../types/Erc20ConversionProxy'; +import type { Erc20ConversionProxy } from '../../../types'; export const erc20ConversionProxy = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/Erc20SwapConversion/index.ts b/packages/smart-contracts/src/lib/artifacts/Erc20SwapConversion/index.ts index c66cc21331..8552e551ad 100644 --- a/packages/smart-contracts/src/lib/artifacts/Erc20SwapConversion/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/Erc20SwapConversion/index.ts @@ -3,7 +3,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; import { abi as ABI_0_2_0 } from './0.2.0.json'; // @ts-ignore Cannot find module -import type { ERC20SwapToConversion } from '../../../types/ERC20SwapToConversion'; +import type { ERC20SwapToConversion } from '../../../types'; export const erc20SwapConversionArtifact = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/EthConversionProxy/index.ts b/packages/smart-contracts/src/lib/artifacts/EthConversionProxy/index.ts index d7e32cc250..8c18e1e019 100644 --- a/packages/smart-contracts/src/lib/artifacts/EthConversionProxy/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/EthConversionProxy/index.ts @@ -3,7 +3,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; import { abi as ABI_0_2_0 } from './0.2.0.json'; // @ts-ignore Cannot find module -import type { EthConversionProxy } from '../../../types/EthConversionProxy'; +import type { EthConversionProxy } from '../../../types'; export const ethConversionArtifact = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/EthereumFeeProxy/index.ts b/packages/smart-contracts/src/lib/artifacts/EthereumFeeProxy/index.ts index 71c693fb66..41dd24a809 100644 --- a/packages/smart-contracts/src/lib/artifacts/EthereumFeeProxy/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/EthereumFeeProxy/index.ts @@ -2,7 +2,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; // @ts-ignore Cannot find module -import type { EthereumFeeProxy } from '../../../types/EthereumFeeProxy'; +import type { EthereumFeeProxy } from '../../../types'; export const ethereumFeeProxyArtifact = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/EthereumProxy/index.ts b/packages/smart-contracts/src/lib/artifacts/EthereumProxy/index.ts index 9e31bd6db6..babdcf9829 100644 --- a/packages/smart-contracts/src/lib/artifacts/EthereumProxy/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/EthereumProxy/index.ts @@ -2,7 +2,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; // @ts-ignore Cannot find module -import type { EthereumProxy } from '../../../types/EthereumProxy'; +import type { EthereumProxy } from '../../../types'; export const ethereumProxyArtifact = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/RequestDeployer/index.ts b/packages/smart-contracts/src/lib/artifacts/RequestDeployer/index.ts index e2a0fd2af4..c4c6471a9e 100644 --- a/packages/smart-contracts/src/lib/artifacts/RequestDeployer/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/RequestDeployer/index.ts @@ -2,7 +2,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; // @ts-ignore Cannot find module -import type { RequestDeployer } from '../../../types/RequestDeployer'; +import type { RequestDeployer } from '../../../types'; export const requestDeployer = new ContractArtifact( { diff --git a/packages/smart-contracts/src/lib/artifacts/RequestHashStorage/index.ts b/packages/smart-contracts/src/lib/artifacts/RequestHashStorage/index.ts index d9b4ae963c..764bf99ee4 100644 --- a/packages/smart-contracts/src/lib/artifacts/RequestHashStorage/index.ts +++ b/packages/smart-contracts/src/lib/artifacts/RequestHashStorage/index.ts @@ -2,7 +2,7 @@ import { ContractArtifact } from '../../ContractArtifact'; import { abi as ABI_0_1_0 } from './0.1.0.json'; // @ts-ignore Cannot find module -import type { RequestHashStorage } from '../../../types/RequestHashStorage'; +import type { RequestHashStorage } from '../../../types'; export const requestHashStorageArtifact = new ContractArtifact( {