diff --git a/src/factories/NFTFactory.ts b/src/factories/NFTFactory.ts index c0c28402..c31b5002 100644 --- a/src/factories/NFTFactory.ts +++ b/src/factories/NFTFactory.ts @@ -10,9 +10,9 @@ import { getFreCreationParams, getErcCreationParams, getPoolCreationParams, - configHelperNetworks, setContractDefaults, - ZERO_ADDRESS + ZERO_ADDRESS, + ConfigHelper } from '../utils' import { Config } from '../models/index.js' import { @@ -67,12 +67,13 @@ export class NftFactory { factory721Address: string, web3: Web3, factory721Abi?: AbiItem | AbiItem[], - config?: Config + config?: Config, + network?: string | number ) { this.factory721Address = factory721Address this.factory721Abi = factory721Abi || (defaultFactory721Abi.abi as AbiItem[]) this.web3 = web3 - this.config = config || configHelperNetworks[0] + this.config = config || new ConfigHelper().getConfig(network || 'unknown') this.factory721 = setContractDefaults( new this.web3.eth.Contract(this.factory721Abi, this.factory721Address), this.config diff --git a/src/pools/Router.ts b/src/pools/Router.ts index 0c6f56f5..4ef42c0f 100644 --- a/src/pools/Router.ts +++ b/src/pools/Router.ts @@ -3,7 +3,7 @@ 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, configHelperNetworks } from '../utils' +import { getFairGasPrice, setContractDefaults, ConfigHelper } from '../utils' import { Operation } from '../@types/Router' import { Config } from '../models/index.js' @@ -28,12 +28,13 @@ export class Router { routerAddress: string, web3: Web3, RouterAbi?: AbiItem | AbiItem[], - config?: Config + config?: Config, + network?: string | number ) { this.routerAddress = routerAddress this.RouterAbi = RouterAbi || (defaultRouter.abi as AbiItem[]) this.web3 = web3 - this.config = config || configHelperNetworks[0] + this.config = config || new ConfigHelper().getConfig(network || 'unknown') this.router = setContractDefaults( new this.web3.eth.Contract(this.RouterAbi, this.routerAddress), this.config diff --git a/src/pools/balancer/Pool.ts b/src/pools/balancer/Pool.ts index 41f787e3..0508f5ab 100644 --- a/src/pools/balancer/Pool.ts +++ b/src/pools/balancer/Pool.ts @@ -4,11 +4,11 @@ import { TransactionReceipt } from 'web3-core' import { Contract } from 'web3-eth-contract' import { getFairGasPrice, - configHelperNetworks, setContractDefaults, unitsToAmount, amountToUnits, - LoggerInstance + LoggerInstance, + ConfigHelper } from '../../utils' import BigNumber from 'bignumber.js' import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json' @@ -40,11 +40,16 @@ export class Pool { public GASLIMIT_DEFAULT = 1000000 private config: Config - constructor(web3: Web3, poolAbi: AbiItem | AbiItem[] = null, config?: Config) { + constructor( + web3: Web3, + poolAbi: AbiItem | AbiItem[] = null, + config?: Config, + network?: string | number + ) { if (poolAbi) this.poolAbi = poolAbi else this.poolAbi = PoolTemplate.abi as AbiItem[] this.web3 = web3 - this.config = config || configHelperNetworks[0] + this.config = config || new ConfigHelper().getConfig(network || 'unknown') } /** diff --git a/src/pools/dispenser/Dispenser.ts b/src/pools/dispenser/Dispenser.ts index 22b1f42b..ae9cf1b5 100644 --- a/src/pools/dispenser/Dispenser.ts +++ b/src/pools/dispenser/Dispenser.ts @@ -7,8 +7,8 @@ import defaultDispenserAbi from '@oceanprotocol/contracts/artifacts/contracts/po import { LoggerInstance as logger, getFairGasPrice, - configHelperNetworks, - setContractDefaults + setContractDefaults, + ConfigHelper } from '../../utils/' import { Datatoken } from '../../tokens' import { Config } from '../../models/index.js' @@ -41,12 +41,13 @@ export class Dispenser { web3: Web3, dispenserAddress: string = null, dispenserAbi: AbiItem | AbiItem[] = null, - config?: Config + config?: Config, + network?: string | number ) { this.web3 = web3 this.dispenserAddress = dispenserAddress this.dispenserAbi = dispenserAbi || (defaultDispenserAbi.abi as AbiItem[]) - this.config = config || configHelperNetworks[0] + this.config = config || new ConfigHelper().getConfig(network || 'unknown') if (web3) this.dispenserContract = setContractDefaults( new this.web3.eth.Contract(this.dispenserAbi, this.dispenserAddress), diff --git a/src/pools/fixedRate/FixedRateExchange.ts b/src/pools/fixedRate/FixedRateExchange.ts index 90e2bab9..a953790b 100644 --- a/src/pools/fixedRate/FixedRateExchange.ts +++ b/src/pools/fixedRate/FixedRateExchange.ts @@ -6,11 +6,11 @@ import Web3 from 'web3' import { LoggerInstance, getFairGasPrice, - configHelperNetworks, setContractDefaults, amountToUnits, unitsToAmount, - ZERO_ADDRESS + ZERO_ADDRESS, + ConfigHelper } from '../../utils' import { Config } from '../../models/index.js' import { PriceAndFees } from '../..' @@ -77,10 +77,11 @@ export class FixedRateExchange { fixedRateAddress: string, fixedRateExchangeAbi: AbiItem | AbiItem[] = null, oceanAddress: string = null, - config?: Config + config?: Config, + network?: string | number ) { this.web3 = web3 - this.config = config || configHelperNetworks[0] + this.config = config || new ConfigHelper().getConfig(network || 'unknown') this.fixedRateExchangeAbi = fixedRateExchangeAbi || (defaultFixedRateExchangeAbi.abi as AbiItem[]) this.oceanAddress = oceanAddress diff --git a/src/pools/ssContracts/SideStaking.ts b/src/pools/ssContracts/SideStaking.ts index b1dda5d0..235c6425 100644 --- a/src/pools/ssContracts/SideStaking.ts +++ b/src/pools/ssContracts/SideStaking.ts @@ -2,7 +2,7 @@ import Web3 from 'web3' import { AbiItem } from 'web3-utils/types' import { TransactionReceipt } from 'web3-core' import { Contract } from 'web3-eth-contract' -import { LoggerInstance, getFairGasPrice, configHelperNetworks } from '../../utils' +import { LoggerInstance, getFairGasPrice, ConfigHelper } from '../../utils' import BigNumber from 'bignumber.js' import SideStakingTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json' import defaultErc20Abi from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json' @@ -14,11 +14,16 @@ export class SideStaking { public GASLIMIT_DEFAULT = 1000000 public config: Config - constructor(web3: Web3, ssAbi: AbiItem | AbiItem[] = null, config?: Config) { + constructor( + web3: Web3, + ssAbi: AbiItem | AbiItem[] = null, + config?: Config, + network?: string | number + ) { if (ssAbi) this.ssAbi = ssAbi else this.ssAbi = SideStakingTemplate.abi as AbiItem[] this.web3 = web3 - this.config = config || configHelperNetworks[0] + this.config = config || new ConfigHelper().getConfig(network || 'unknown') } async amountToUnits(token: string, amount: string): Promise { diff --git a/src/tokens/Datatoken.ts b/src/tokens/Datatoken.ts index bcebc1df..037fe9cb 100644 --- a/src/tokens/Datatoken.ts +++ b/src/tokens/Datatoken.ts @@ -9,9 +9,9 @@ import { LoggerInstance, getFairGasPrice, setContractDefaults, - configHelperNetworks, getFreOrderParams, - ZERO_ADDRESS + ZERO_ADDRESS, + ConfigHelper } from '../utils' import { ConsumeMarketFee, @@ -63,13 +63,14 @@ export class Datatoken { web3: Web3, datatokensAbi?: AbiItem | AbiItem[], datatokensEnterpriseAbi?: AbiItem | AbiItem[], - config?: Config + config?: Config, + network?: string | number ) { this.web3 = web3 this.datatokensAbi = datatokensAbi || (defaultDatatokensAbi.abi as AbiItem[]) this.datatokensEnterpriseAbi = datatokensEnterpriseAbi || (defaultDatatokensEnterpriseAbi.abi as AbiItem[]) - this.config = config || configHelperNetworks[0] + this.config = config || new ConfigHelper().getConfig(network || 'unknown') this.nft = new Nft(this.web3) } diff --git a/src/tokens/NFT.ts b/src/tokens/NFT.ts index b0322e0b..3ceb4e1f 100644 --- a/src/tokens/NFT.ts +++ b/src/tokens/NFT.ts @@ -7,7 +7,7 @@ import { getFairGasPrice, generateDtName, setContractDefaults, - configHelperNetworks + ConfigHelper } from '../utils' import { Contract } from 'web3-eth-contract' import { MetadataProof } from '../../src/@types' @@ -33,10 +33,15 @@ export class Nft { public startBlock: number public config: Config - constructor(web3: Web3, nftAbi?: AbiItem | AbiItem[], config?: Config) { + constructor( + web3: Web3, + nftAbi?: AbiItem | AbiItem[], + config?: Config, + network?: string | number + ) { this.nftAbi = nftAbi || (defaultNftAbi.abi as AbiItem[]) this.web3 = web3 - this.config = config || configHelperNetworks[0] + this.config = config || new ConfigHelper().getConfig(network || 'unknown') } /**