From e4b1942e701326ff2cb7d10e7ae27bdaa423846c Mon Sep 17 00:00:00 2001 From: "Miquel A. Cabot" Date: Thu, 2 Jun 2022 19:07:52 +0200 Subject: [PATCH 1/6] change Config file to src/config --- src/{models => config}/Config.ts | 0 src/{models => config}/index.ts | 0 src/factories/NFTFactory.ts | 2 +- src/index.ts | 2 +- src/pools/Router.ts | 2 +- src/pools/balancer/Pool.ts | 2 +- src/pools/dispenser/Dispenser.ts | 2 +- src/pools/fixedRate/FixedRateExchange.ts | 2 +- src/pools/ssContracts/SideStaking.ts | 2 +- src/tokens/Datatoken.ts | 2 +- src/tokens/NFT.ts | 2 +- src/utils/ConfigHelper.ts | 2 +- src/utils/ContractUtils.ts | 2 +- 13 files changed, 11 insertions(+), 11 deletions(-) rename src/{models => config}/Config.ts (100%) rename src/{models => config}/index.ts (100%) diff --git a/src/models/Config.ts b/src/config/Config.ts similarity index 100% rename from src/models/Config.ts rename to src/config/Config.ts diff --git a/src/models/index.ts b/src/config/index.ts similarity index 100% rename from src/models/index.ts rename to src/config/index.ts diff --git a/src/factories/NFTFactory.ts b/src/factories/NFTFactory.ts index 9b697282..04715fd1 100644 --- a/src/factories/NFTFactory.ts +++ b/src/factories/NFTFactory.ts @@ -15,7 +15,7 @@ import { ZERO_ADDRESS, ConfigHelper } from '../utils' -import { Config } from '../models/index.js' +import { Config } from '../config/index.js' import { ProviderFees, FreCreationParams, diff --git a/src/index.ts b/src/index.ts index 5447a5f4..d8ec7b68 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,7 @@ export * from './aquarius' export * from './pools' export * from './tokens' export * from './factories' -export * from './models' +export * from './config' export * from './utils' export * from './@types' export * from './provider' diff --git a/src/pools/Router.ts b/src/pools/Router.ts index 25567847..a206a2ae 100644 --- a/src/pools/Router.ts +++ b/src/pools/Router.ts @@ -5,7 +5,7 @@ import { AbiItem } from 'web3-utils' import defaultRouter from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.json' import { getFairGasPrice, setContractDefaults, ConfigHelper, estimateGas } from '../utils' import { Operation } from '../@types/Router' -import { Config } from '../models/index.js' +import { Config } from '../config/index.js' /** * Provides an interface for FactoryRouter contract diff --git a/src/pools/balancer/Pool.ts b/src/pools/balancer/Pool.ts index 95096265..9fa7c989 100644 --- a/src/pools/balancer/Pool.ts +++ b/src/pools/balancer/Pool.ts @@ -21,7 +21,7 @@ import { AmountsOutMaxFee, PoolPriceAndFees } from '../../@types' -import { Config } from '../../models' +import { Config } from '../../config' import { getMaxAddLiquidity, getMaxRemoveLiquidity, diff --git a/src/pools/dispenser/Dispenser.ts b/src/pools/dispenser/Dispenser.ts index c26e0ea4..1ee21e6c 100644 --- a/src/pools/dispenser/Dispenser.ts +++ b/src/pools/dispenser/Dispenser.ts @@ -12,7 +12,7 @@ import { ConfigHelper } from '../../utils/' import { Datatoken } from '../../tokens' -import { Config } from '../../models/index.js' +import { Config } from '../../config/index.js' export interface DispenserToken { active: boolean diff --git a/src/pools/fixedRate/FixedRateExchange.ts b/src/pools/fixedRate/FixedRateExchange.ts index ca3e5bd9..07172833 100644 --- a/src/pools/fixedRate/FixedRateExchange.ts +++ b/src/pools/fixedRate/FixedRateExchange.ts @@ -13,7 +13,7 @@ import { ZERO_ADDRESS, ConfigHelper } from '../../utils' -import { Config } from '../../models/index.js' +import { Config } from '../../config/index.js' import { PriceAndFees } from '../..' export interface FixedPriceExchange { diff --git a/src/pools/ssContracts/SideStaking.ts b/src/pools/ssContracts/SideStaking.ts index 154ea1a5..f38e803c 100644 --- a/src/pools/ssContracts/SideStaking.ts +++ b/src/pools/ssContracts/SideStaking.ts @@ -10,7 +10,7 @@ import { unitsToAmount } from '../../utils' import SideStakingTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json' -import { Config } from '../../models' +import { Config } from '../../config' export class SideStaking { public ssAbi: AbiItem | AbiItem[] diff --git a/src/tokens/Datatoken.ts b/src/tokens/Datatoken.ts index 5c155d5d..cfc3de33 100644 --- a/src/tokens/Datatoken.ts +++ b/src/tokens/Datatoken.ts @@ -22,7 +22,7 @@ import { PublishingMarketFee } from '../@types' import { Nft } from './NFT' -import { Config } from '../models/index.js' +import { Config } from '../config/index.js' /** * ERC20 ROLES diff --git a/src/tokens/NFT.ts b/src/tokens/NFT.ts index 7fd2b4b1..7bad7ac4 100644 --- a/src/tokens/NFT.ts +++ b/src/tokens/NFT.ts @@ -12,7 +12,7 @@ import { } from '../utils' import { Contract } from 'web3-eth-contract' import { MetadataProof } from '../../src/@types' -import { Config } from '../models/index.js' +import { Config } from '../config/index.js' import { MetadataAndTokenURI } from '../@types' /** diff --git a/src/utils/ConfigHelper.ts b/src/utils/ConfigHelper.ts index cc01d00c..b464f8d9 100644 --- a/src/utils/ConfigHelper.ts +++ b/src/utils/ConfigHelper.ts @@ -1,4 +1,4 @@ -import Config from '../models/Config' +import Config from '../config/Config' // eslint-disable-next-line import/no-named-default import { default as DefaultContractsAddresses } from '@oceanprotocol/contracts/addresses/address.json' import LoggerInstance from './Logger' diff --git a/src/utils/ContractUtils.ts b/src/utils/ContractUtils.ts index 94012c76..475c1c14 100644 --- a/src/utils/ContractUtils.ts +++ b/src/utils/ContractUtils.ts @@ -8,7 +8,7 @@ import { FreOrderParams, PoolCreationParams } from '../@types' -import { Config } from '../models' +import { Config } from '../config' import { minAbi } from './minAbi' import LoggerInstance from './Logger' import { GASLIMIT_DEFAULT, ZERO_ADDRESS } from './Constants' From aab53636b6a586f80a9b07a9875f28b858070b02 Mon Sep 17 00:00:00 2001 From: "Miquel A. Cabot" Date: Thu, 2 Jun 2022 21:45:51 +0200 Subject: [PATCH 2/6] move word.json to /utils --- src/utils/DatatokenName.ts | 2 +- src/{ => utils}/data/words.json | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/{ => utils}/data/words.json (100%) diff --git a/src/utils/DatatokenName.ts b/src/utils/DatatokenName.ts index 31d3ceec..af4ef4a1 100644 --- a/src/utils/DatatokenName.ts +++ b/src/utils/DatatokenName.ts @@ -1,4 +1,4 @@ -import wordListDefault from '../data/words.json' +import wordListDefault from './data/words.json' /** * Generate new datatoken name & symbol from a word list diff --git a/src/data/words.json b/src/utils/data/words.json similarity index 100% rename from src/data/words.json rename to src/utils/data/words.json From 79612f60c49e807a1b1cde654ad542ea18518f8b Mon Sep 17 00:00:00 2001 From: "Miquel A. Cabot" Date: Thu, 2 Jun 2022 21:49:16 +0200 Subject: [PATCH 3/6] move Aquarius and Provider to /services --- src/index.ts | 5 ++--- src/provider/index.ts | 1 - src/{aquarius => services}/Aquarius.ts | 0 src/{provider => services}/Provider.ts | 0 src/{aquarius => services}/index.ts | 1 + 5 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 src/provider/index.ts rename src/{aquarius => services}/Aquarius.ts (100%) rename src/{provider => services}/Provider.ts (100%) rename src/{aquarius => services}/index.ts (50%) diff --git a/src/index.ts b/src/index.ts index d8ec7b68..4c3f1cd7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,8 +1,7 @@ -export * from './aquarius' +export * from './@types' +export * from './services' export * from './pools' export * from './tokens' export * from './factories' export * from './config' export * from './utils' -export * from './@types' -export * from './provider' diff --git a/src/provider/index.ts b/src/provider/index.ts deleted file mode 100644 index 0ce7b023..00000000 --- a/src/provider/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './Provider' diff --git a/src/aquarius/Aquarius.ts b/src/services/Aquarius.ts similarity index 100% rename from src/aquarius/Aquarius.ts rename to src/services/Aquarius.ts diff --git a/src/provider/Provider.ts b/src/services/Provider.ts similarity index 100% rename from src/provider/Provider.ts rename to src/services/Provider.ts diff --git a/src/aquarius/index.ts b/src/services/index.ts similarity index 50% rename from src/aquarius/index.ts rename to src/services/index.ts index da423a41..7ad71555 100644 --- a/src/aquarius/index.ts +++ b/src/services/index.ts @@ -1 +1,2 @@ export * from './Aquarius' +export * from './Provider' From 433999ef40ede81a1a6e54f9fdde4f962787eb46 Mon Sep 17 00:00:00 2001 From: "Miquel A. Cabot" Date: Thu, 2 Jun 2022 21:55:24 +0200 Subject: [PATCH 4/6] move smart contract classes to /contracts --- src/{ => contracts}/factories/NFTFactory.ts | 6 +++--- src/contracts/index.ts | 8 ++++++++ src/{pools/dispenser => contracts/pools}/Dispenser.ts | 2 +- .../pools}/FixedRateExchange.ts | 0 src/{pools/balancer => contracts/pools}/Pool.ts | 0 src/{ => contracts}/pools/Router.ts | 11 ++++++++--- .../ssContracts => contracts/pools}/SideStaking.ts | 0 src/{ => contracts}/tokens/Datatoken.ts | 6 +++--- src/{ => contracts}/tokens/NFT.ts | 7 +++---- src/factories/index.ts | 1 - src/index.ts | 4 +--- src/pools/balancer/index.ts | 1 - src/pools/dispenser/index.ts | 1 - src/pools/fixedRate/index.ts | 1 - src/pools/index.ts | 5 ----- src/pools/ssContracts/index.ts | 1 - src/tokens/index.ts | 2 -- 17 files changed, 27 insertions(+), 29 deletions(-) rename src/{ => contracts}/factories/NFTFactory.ts (99%) create mode 100644 src/contracts/index.ts rename src/{pools/dispenser => contracts/pools}/Dispenser.ts (99%) rename src/{pools/fixedRate => contracts/pools}/FixedRateExchange.ts (100%) rename src/{pools/balancer => contracts/pools}/Pool.ts (100%) rename src/{ => contracts}/pools/Router.ts (98%) rename src/{pools/ssContracts => contracts/pools}/SideStaking.ts (100%) rename src/{ => contracts}/tokens/Datatoken.ts (99%) rename src/{ => contracts}/tokens/NFT.ts (99%) delete mode 100644 src/factories/index.ts delete mode 100644 src/pools/balancer/index.ts delete mode 100644 src/pools/dispenser/index.ts delete mode 100644 src/pools/fixedRate/index.ts delete mode 100644 src/pools/index.ts delete mode 100644 src/pools/ssContracts/index.ts delete mode 100644 src/tokens/index.ts diff --git a/src/factories/NFTFactory.ts b/src/contracts/factories/NFTFactory.ts similarity index 99% rename from src/factories/NFTFactory.ts rename to src/contracts/factories/NFTFactory.ts index 04715fd1..7112c04e 100644 --- a/src/factories/NFTFactory.ts +++ b/src/contracts/factories/NFTFactory.ts @@ -14,8 +14,8 @@ import { estimateGas, ZERO_ADDRESS, ConfigHelper -} from '../utils' -import { Config } from '../config/index.js' +} from '../../utils' +import { Config } from '../../config' import { ProviderFees, FreCreationParams, @@ -23,7 +23,7 @@ import { PoolCreationParams, DispenserCreationParams, ConsumeMarketFee -} from '../@types/index.js' +} from '../../@types' interface Template { templateAddress: string diff --git a/src/contracts/index.ts b/src/contracts/index.ts new file mode 100644 index 00000000..bef542cb --- /dev/null +++ b/src/contracts/index.ts @@ -0,0 +1,8 @@ +export * from './factories/NFTFactory' +export * from './pools/Dispenser' +export * from './pools/FixedRateExchange' +export * from './pools/Pool' +export * from './pools/Router' +export * from './pools/SideStaking' +export * from './tokens/Datatoken' +export * from './tokens/NFT' diff --git a/src/pools/dispenser/Dispenser.ts b/src/contracts/pools/Dispenser.ts similarity index 99% rename from src/pools/dispenser/Dispenser.ts rename to src/contracts/pools/Dispenser.ts index 1ee21e6c..ac01d8e7 100644 --- a/src/pools/dispenser/Dispenser.ts +++ b/src/contracts/pools/Dispenser.ts @@ -11,7 +11,7 @@ import { estimateGas, ConfigHelper } from '../../utils/' -import { Datatoken } from '../../tokens' +import { Datatoken } from '..' import { Config } from '../../config/index.js' export interface DispenserToken { diff --git a/src/pools/fixedRate/FixedRateExchange.ts b/src/contracts/pools/FixedRateExchange.ts similarity index 100% rename from src/pools/fixedRate/FixedRateExchange.ts rename to src/contracts/pools/FixedRateExchange.ts diff --git a/src/pools/balancer/Pool.ts b/src/contracts/pools/Pool.ts similarity index 100% rename from src/pools/balancer/Pool.ts rename to src/contracts/pools/Pool.ts diff --git a/src/pools/Router.ts b/src/contracts/pools/Router.ts similarity index 98% rename from src/pools/Router.ts rename to src/contracts/pools/Router.ts index a206a2ae..40b3a226 100644 --- a/src/pools/Router.ts +++ b/src/contracts/pools/Router.ts @@ -3,9 +3,14 @@ import Web3 from 'web3' import { TransactionReceipt } from 'web3-core' import { AbiItem } from 'web3-utils' import defaultRouter from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.json' -import { getFairGasPrice, setContractDefaults, ConfigHelper, estimateGas } from '../utils' -import { Operation } from '../@types/Router' -import { Config } from '../config/index.js' +import { + getFairGasPrice, + setContractDefaults, + ConfigHelper, + estimateGas +} from '../../utils' +import { Operation } from '../../@types/Router' +import { Config } from '../../config/index.js' /** * Provides an interface for FactoryRouter contract diff --git a/src/pools/ssContracts/SideStaking.ts b/src/contracts/pools/SideStaking.ts similarity index 100% rename from src/pools/ssContracts/SideStaking.ts rename to src/contracts/pools/SideStaking.ts diff --git a/src/tokens/Datatoken.ts b/src/contracts/tokens/Datatoken.ts similarity index 99% rename from src/tokens/Datatoken.ts rename to src/contracts/tokens/Datatoken.ts index cfc3de33..9ecd2530 100644 --- a/src/tokens/Datatoken.ts +++ b/src/contracts/tokens/Datatoken.ts @@ -13,16 +13,16 @@ import { estimateGas, ZERO_ADDRESS, ConfigHelper -} from '../utils' +} from '../../utils' import { ConsumeMarketFee, FreOrderParams, FreCreationParams, ProviderFees, PublishingMarketFee -} from '../@types' +} from '../../@types' import { Nft } from './NFT' -import { Config } from '../config/index.js' +import { Config } from '../../config' /** * ERC20 ROLES diff --git a/src/tokens/NFT.ts b/src/contracts/tokens/NFT.ts similarity index 99% rename from src/tokens/NFT.ts rename to src/contracts/tokens/NFT.ts index 7bad7ac4..b5b07018 100644 --- a/src/tokens/NFT.ts +++ b/src/contracts/tokens/NFT.ts @@ -9,11 +9,10 @@ import { setContractDefaults, estimateGas, ConfigHelper -} from '../utils' +} from '../../utils' import { Contract } from 'web3-eth-contract' -import { MetadataProof } from '../../src/@types' -import { Config } from '../config/index.js' -import { MetadataAndTokenURI } from '../@types' +import { MetadataProof, MetadataAndTokenURI } from '../../@types' +import { Config } from '../../config' /** * ERC721 ROLES diff --git a/src/factories/index.ts b/src/factories/index.ts deleted file mode 100644 index 17b42cb9..00000000 --- a/src/factories/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './NFTFactory' diff --git a/src/index.ts b/src/index.ts index 4c3f1cd7..bca55e9b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,7 +1,5 @@ export * from './@types' export * from './services' -export * from './pools' -export * from './tokens' -export * from './factories' +export * from './contracts' export * from './config' export * from './utils' diff --git a/src/pools/balancer/index.ts b/src/pools/balancer/index.ts deleted file mode 100644 index 0d56f727..00000000 --- a/src/pools/balancer/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './Pool' diff --git a/src/pools/dispenser/index.ts b/src/pools/dispenser/index.ts deleted file mode 100644 index e6284e41..00000000 --- a/src/pools/dispenser/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './Dispenser' diff --git a/src/pools/fixedRate/index.ts b/src/pools/fixedRate/index.ts deleted file mode 100644 index 88b1dccc..00000000 --- a/src/pools/fixedRate/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './FixedRateExchange' diff --git a/src/pools/index.ts b/src/pools/index.ts deleted file mode 100644 index 378520db..00000000 --- a/src/pools/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './balancer' -export * from './dispenser' -export * from './fixedRate' -export * from './ssContracts' -export * from './Router' diff --git a/src/pools/ssContracts/index.ts b/src/pools/ssContracts/index.ts deleted file mode 100644 index 8ade0ddb..00000000 --- a/src/pools/ssContracts/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './SideStaking' diff --git a/src/tokens/index.ts b/src/tokens/index.ts deleted file mode 100644 index 5e47c88e..00000000 --- a/src/tokens/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './Datatoken' -export * from './NFT' From 45e9f81f309320616ff6299b8f9443fb83ddbe2f Mon Sep 17 00:00:00 2001 From: "Miquel A. Cabot" Date: Thu, 2 Jun 2022 22:29:47 +0200 Subject: [PATCH 5/6] move ConfigHelper to /config --- src/{utils => config}/ConfigHelper.ts | 4 ++-- src/config/index.ts | 1 + src/contracts/factories/NFTFactory.ts | 5 ++--- src/contracts/pools/Dispenser.ts | 5 ++--- src/contracts/pools/FixedRateExchange.ts | 5 ++--- src/contracts/pools/Pool.ts | 5 ++--- src/contracts/pools/Router.ts | 9 ++------- src/contracts/pools/SideStaking.ts | 10 ++-------- src/contracts/tokens/Datatoken.ts | 5 ++--- src/contracts/tokens/NFT.ts | 5 ++--- src/utils/index.ts | 1 - test/config.ts | 8 ++------ 12 files changed, 21 insertions(+), 42 deletions(-) rename src/{utils => config}/ConfigHelper.ts (98%) diff --git a/src/utils/ConfigHelper.ts b/src/config/ConfigHelper.ts similarity index 98% rename from src/utils/ConfigHelper.ts rename to src/config/ConfigHelper.ts index b464f8d9..01ce2f87 100644 --- a/src/utils/ConfigHelper.ts +++ b/src/config/ConfigHelper.ts @@ -1,7 +1,7 @@ -import Config from '../config/Config' +import { Config } from './Config' // eslint-disable-next-line import/no-named-default import { default as DefaultContractsAddresses } from '@oceanprotocol/contracts/addresses/address.json' -import LoggerInstance from './Logger' +import { LoggerInstance } from '..' const configHelperNetworksBase: Config = { chainId: null, diff --git a/src/config/index.ts b/src/config/index.ts index a871693a..3ac42305 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -1 +1,2 @@ export * from './Config' +export * from './ConfigHelper' diff --git a/src/contracts/factories/NFTFactory.ts b/src/contracts/factories/NFTFactory.ts index 7112c04e..cca80872 100644 --- a/src/contracts/factories/NFTFactory.ts +++ b/src/contracts/factories/NFTFactory.ts @@ -12,10 +12,9 @@ import { getPoolCreationParams, setContractDefaults, estimateGas, - ZERO_ADDRESS, - ConfigHelper + ZERO_ADDRESS } from '../../utils' -import { Config } from '../../config' +import { Config, ConfigHelper } from '../../config' import { ProviderFees, FreCreationParams, diff --git a/src/contracts/pools/Dispenser.ts b/src/contracts/pools/Dispenser.ts index ac01d8e7..d50a0668 100644 --- a/src/contracts/pools/Dispenser.ts +++ b/src/contracts/pools/Dispenser.ts @@ -8,11 +8,10 @@ import { LoggerInstance as logger, getFairGasPrice, setContractDefaults, - estimateGas, - ConfigHelper + estimateGas } from '../../utils/' import { Datatoken } from '..' -import { Config } from '../../config/index.js' +import { Config, ConfigHelper } from '../../config' export interface DispenserToken { active: boolean diff --git a/src/contracts/pools/FixedRateExchange.ts b/src/contracts/pools/FixedRateExchange.ts index 07172833..b43e5f4b 100644 --- a/src/contracts/pools/FixedRateExchange.ts +++ b/src/contracts/pools/FixedRateExchange.ts @@ -10,10 +10,9 @@ import { amountToUnits, unitsToAmount, estimateGas, - ZERO_ADDRESS, - ConfigHelper + ZERO_ADDRESS } from '../../utils' -import { Config } from '../../config/index.js' +import { Config, ConfigHelper } from '../../config' import { PriceAndFees } from '../..' export interface FixedPriceExchange { diff --git a/src/contracts/pools/Pool.ts b/src/contracts/pools/Pool.ts index 9fa7c989..1af63c4a 100644 --- a/src/contracts/pools/Pool.ts +++ b/src/contracts/pools/Pool.ts @@ -8,8 +8,7 @@ import { unitsToAmount, amountToUnits, LoggerInstance, - estimateGas, - ConfigHelper + estimateGas } from '../../utils' import BigNumber from 'bignumber.js' import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json' @@ -21,7 +20,7 @@ import { AmountsOutMaxFee, PoolPriceAndFees } from '../../@types' -import { Config } from '../../config' +import { Config, ConfigHelper } from '../../config' import { getMaxAddLiquidity, getMaxRemoveLiquidity, diff --git a/src/contracts/pools/Router.ts b/src/contracts/pools/Router.ts index 40b3a226..69972d70 100644 --- a/src/contracts/pools/Router.ts +++ b/src/contracts/pools/Router.ts @@ -3,14 +3,9 @@ import Web3 from 'web3' import { TransactionReceipt } from 'web3-core' import { AbiItem } from 'web3-utils' import defaultRouter from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.json' -import { - getFairGasPrice, - setContractDefaults, - ConfigHelper, - estimateGas -} from '../../utils' +import { getFairGasPrice, setContractDefaults, estimateGas } from '../../utils' import { Operation } from '../../@types/Router' -import { Config } from '../../config/index.js' +import { Config, ConfigHelper } from '../../config' /** * Provides an interface for FactoryRouter contract diff --git a/src/contracts/pools/SideStaking.ts b/src/contracts/pools/SideStaking.ts index f38e803c..60d51c9c 100644 --- a/src/contracts/pools/SideStaking.ts +++ b/src/contracts/pools/SideStaking.ts @@ -2,15 +2,9 @@ import Web3 from 'web3' import { AbiItem } from 'web3-utils/types' import { TransactionReceipt } from 'web3-core' import { Contract } from 'web3-eth-contract' -import { - LoggerInstance, - getFairGasPrice, - ConfigHelper, - estimateGas, - unitsToAmount -} from '../../utils' +import { LoggerInstance, getFairGasPrice, estimateGas, unitsToAmount } from '../../utils' import SideStakingTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json' -import { Config } from '../../config' +import { Config, ConfigHelper } from '../../config' export class SideStaking { public ssAbi: AbiItem | AbiItem[] diff --git a/src/contracts/tokens/Datatoken.ts b/src/contracts/tokens/Datatoken.ts index 9ecd2530..21912fb5 100644 --- a/src/contracts/tokens/Datatoken.ts +++ b/src/contracts/tokens/Datatoken.ts @@ -11,8 +11,7 @@ import { setContractDefaults, getFreOrderParams, estimateGas, - ZERO_ADDRESS, - ConfigHelper + ZERO_ADDRESS } from '../../utils' import { ConsumeMarketFee, @@ -22,7 +21,7 @@ import { PublishingMarketFee } from '../../@types' import { Nft } from './NFT' -import { Config } from '../../config' +import { Config, ConfigHelper } from '../../config' /** * ERC20 ROLES diff --git a/src/contracts/tokens/NFT.ts b/src/contracts/tokens/NFT.ts index b5b07018..202d9f51 100644 --- a/src/contracts/tokens/NFT.ts +++ b/src/contracts/tokens/NFT.ts @@ -7,12 +7,11 @@ import { getFairGasPrice, generateDtName, setContractDefaults, - estimateGas, - ConfigHelper + estimateGas } from '../../utils' import { Contract } from 'web3-eth-contract' import { MetadataProof, MetadataAndTokenURI } from '../../@types' -import { Config } from '../../config' +import { Config, ConfigHelper } from '../../config' /** * ERC721 ROLES diff --git a/src/utils/index.ts b/src/utils/index.ts index 7085dbc0..2ef7951e 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -2,7 +2,6 @@ export * from './Logger' export * from './DatatokenName' export * from './ContractUtils' export * from './FetchHelper' -export * from './ConfigHelper' export * from './DdoHelpers' export * from './Constants' export * from './SignatureUtils' diff --git a/test/config.ts b/test/config.ts index f86adce1..2fad75f5 100644 --- a/test/config.ts +++ b/test/config.ts @@ -1,12 +1,8 @@ import Web3 from 'web3' import fs from 'fs' import { homedir } from 'os' -import { - ConfigHelper, - configHelperNetworks, - LoggerInstance, - LogLevel -} from '../src/utils' +import { ConfigHelper, configHelperNetworks } from '..' +import { LoggerInstance, LogLevel } from '../src/utils' LoggerInstance.setLevel(LogLevel.Error) From 68a390d4f8786fe1a227b71f76a5055b498f6b3c Mon Sep 17 00:00:00 2001 From: "Miquel A. Cabot" Date: Fri, 3 Jun 2022 07:49:57 +0200 Subject: [PATCH 6/6] fix imports --- src/config/ConfigHelper.ts | 2 +- test/config.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/ConfigHelper.ts b/src/config/ConfigHelper.ts index 01ce2f87..bbe0adda 100644 --- a/src/config/ConfigHelper.ts +++ b/src/config/ConfigHelper.ts @@ -1,7 +1,7 @@ import { Config } from './Config' // eslint-disable-next-line import/no-named-default import { default as DefaultContractsAddresses } from '@oceanprotocol/contracts/addresses/address.json' -import { LoggerInstance } from '..' +import { LoggerInstance } from '../utils' const configHelperNetworksBase: Config = { chainId: null, diff --git a/test/config.ts b/test/config.ts index 2fad75f5..19519b18 100644 --- a/test/config.ts +++ b/test/config.ts @@ -1,7 +1,7 @@ import Web3 from 'web3' import fs from 'fs' import { homedir } from 'os' -import { ConfigHelper, configHelperNetworks } from '..' +import { ConfigHelper, configHelperNetworks } from '../src/config' import { LoggerInstance, LogLevel } from '../src/utils' LoggerInstance.setLevel(LogLevel.Error)