4th pass

src/contracts/AccessList.ts

@@ -1,6 +1,6 @@
 import { Signer } from 'ethers'
 import AccessList from '@oceanprotocol/contracts/artifacts/contracts/accesslists/AccessList.sol/AccessList.json'
-import { sendTx } from '../utils'
+import { sendTx } from '../utils/ContractUtils'
 import { AbiItem, ReceiptOrEstimate } from '../@types'
 import { Config } from '../config'
 import { SmartContractWithAddress } from './SmartContractWithAddress'

src/contracts/AccessListFactory.ts

@@ -1,9 +1,11 @@
 import { BigNumber, Signer } from 'ethers'
 import { Config } from '../config'
 import AccessListFactory from '@oceanprotocol/contracts/artifacts/contracts/accesslists/AccessListFactory.sol/AccessListFactory.json'
-import { generateDtName, sendTx, getEventFromTx, ZERO_ADDRESS } from '../utils'
+import { sendTx, getEventFromTx } from '../utils/ContractUtils'
+import { ZERO_ADDRESS } from '../utils/Constants'
 import { AbiItem, ReceiptOrEstimate } from '../@types'
 import { SmartContractWithAddress } from './SmartContractWithAddress'
+import { generateDtName } from '../utils/DatatokenName'
 
 /**
  * Provides an interface for Access List Factory contract

src/contracts/Datatoken.ts

@@ -2,7 +2,8 @@ import { ethers, Signer } from 'ethers'
 import Decimal from 'decimal.js'
 import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json'
 import ERC20TemplateEnterprise from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json'
-import { amountToUnits, sendTx, ZERO_ADDRESS } from '../utils'
+import { amountToUnits, sendTx } from '../utils/ContractUtils'
+import { ZERO_ADDRESS } from '../utils/Constants'
 import {
   AbiItem,
   ConsumeMarketFee,

src/contracts/Datatoken4.ts

@@ -5,7 +5,7 @@ import ERC20Template4 from '@oceanprotocol/contracts/artifacts/contracts/templat
 import { AbiItem, ReceiptOrEstimate } from '../@types'
 import { AccessListContract } from './AccessList'
 import { Config } from '../config'
-import { sendTx } from '../utils'
+import { sendTx } from '../utils/ContractUtils'
 
 export class Datatoken4 extends Datatoken {
   public accessList: AccessListContract

src/contracts/NFT.ts

@@ -8,13 +8,14 @@ import {
   AbiItem
 } from '../@types'
 import { SmartContract } from './SmartContract'
+
+import { generateDtName } from '../utils/DatatokenName'
+import { ZERO_ADDRESS } from '../utils/Constants'
+import { getEventFromTx, sendTx } from '../utils/ContractUtils'
 import {
   calculateActiveTemplateIndex,
   getOceanArtifactsAdressesByChainId
 } from '../utils/Assets'
-import { generateDtName } from '../utils/DatatokenName'
-import { ZERO_ADDRESS } from '../utils/Constants'
-import { getEventFromTx, sendTx } from '../utils/ContractUtils'
 
 export class Nft extends SmartContract {
   getDefaultAbi() {

src/contracts/df/DfRewards.ts

@@ -1,5 +1,5 @@
 import dfRewardsABI from '@oceanprotocol/contracts/artifacts/contracts/df/DFRewards.sol/DFRewards.json'
-import { sendTx } from '../../utils'
+import { sendTx } from '../../utils/ContractUtils'
 import { SmartContractWithAddress } from '../SmartContractWithAddress'
 import { AbiItem, ReceiptOrEstimate } from '../../@types'
 

src/contracts/df/DfStrategyV1.ts

@@ -1,5 +1,5 @@
 import dfStrategyV1ABI from '@oceanprotocol/contracts/artifacts/contracts/df/DFStrategyV1.sol/DFStrategyV1.json'
-import { sendTx } from '../../utils'
+import { sendTx } from '../../utils/ContractUtils'
 import { SmartContractWithAddress } from '../SmartContractWithAddress'
 import { ReceiptOrEstimate, AbiItem } from '../../@types'
 /**

src/contracts/ve/VeAllocate.ts

@@ -1,5 +1,5 @@
 import veAllocateABI from '@oceanprotocol/contracts/artifacts/contracts/ve/veAllocate.sol/veAllocate.json'
-import { sendTx } from '../../utils'
+import { sendTx } from '../../utils/ContractUtils'
 import { SmartContractWithAddress } from '../SmartContractWithAddress'
 import { ReceiptOrEstimate, AbiItem } from '../../@types'
 /**

src/contracts/ve/VeFeeDistributor.ts

@@ -1,5 +1,5 @@
 import veFeeABI from '@oceanprotocol/contracts/artifacts/contracts/ve/veFeeDistributor.vy/veFeeDistributor.json'
-import { sendTx } from '../../utils'
+import { sendTx } from '../../utils/ContractUtils'
 import { SmartContractWithAddress } from '../SmartContractWithAddress'
 import { ReceiptOrEstimate, AbiItem } from '../../@types'
 /**

src/contracts/ve/VeOcean.ts

@@ -1,5 +1,5 @@
 import veOceanABI from '@oceanprotocol/contracts/artifacts/contracts/ve/veOCEAN.vy/veOCEAN.json'
-import { sendTx } from '../../utils'
+import { sendTx } from '../../utils/ContractUtils'
 import { SmartContractWithAddress } from '../SmartContractWithAddress'
 import { ReceiptOrEstimate, AbiItem } from '../../@types'
 /**

src/services/Aquarius.ts

@@ -1,6 +1,7 @@
 import fetch from 'cross-fetch'
-import { LoggerInstance, sleep } from '../utils'
+import { LoggerInstance } from '../utils/Logger'
 import { Asset, DDO, ValidateMetadata } from '../@types'
+import { sleep } from '../utils/General'
 
 export interface SearchQuery {
   from?: number

src/services/Provider.ts

@@ -1,6 +1,6 @@
 import fetch from 'cross-fetch'
 import { ethers, Signer, providers } from 'ethers'
-import { LoggerInstance } from '../utils'
+import { LoggerInstance } from '../utils/Logger'
 import {
   Arweave,
   FileInfo,

src/utils/OrderUtils.ts

@@ -1,20 +1,16 @@
 import { Signer } from 'ethers'
-import {
-  ProviderInstance,
-  Datatoken,
-  Dispenser,
-  Config,
-  OrderParams,
-  Asset,
-  FreOrderParams,
-  approve,
-  FixedRateExchange,
-  ConsumeMarketFee,
-  ProviderFees,
-  ZERO_ADDRESS,
-  approveWei
-} from '../index'
 import Decimal from 'decimal.js'
+import { Asset } from '../@types/Asset'
+import { Config } from '../config/Config'
+import { Datatoken } from '../contracts/Datatoken'
+import { ConsumeMarketFee, OrderParams } from '../@types/Datatoken'
+import { ProviderFees } from '../@types/Provider'
+import { ProviderInstance } from '../services/Provider'
+import { ZERO_ADDRESS } from './Constants'
+import { approve, approveWei } from './TokenUtils'
+import { Dispenser } from '../contracts/Dispenser'
+import { FixedRateExchange } from '../contracts/FixedRateExchange'
+import { FreOrderParams } from '../@types/FixedPrice'
 
 /**
  * Orders an asset based on the specified pricing schema and configuration.