1
0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00

use getConfig(network) function to get proper configuration

This commit is contained in:
Miquel A. Cabot 2022-04-20 16:33:06 +02:00
parent 548f31ced3
commit b259b16d45
8 changed files with 49 additions and 29 deletions

View File

@ -10,9 +10,9 @@ import {
getFreCreationParams, getFreCreationParams,
getErcCreationParams, getErcCreationParams,
getPoolCreationParams, getPoolCreationParams,
configHelperNetworks,
setContractDefaults, setContractDefaults,
ZERO_ADDRESS ZERO_ADDRESS,
ConfigHelper
} from '../utils' } from '../utils'
import { Config } from '../models/index.js' import { Config } from '../models/index.js'
import { import {
@ -67,12 +67,13 @@ export class NftFactory {
factory721Address: string, factory721Address: string,
web3: Web3, web3: Web3,
factory721Abi?: AbiItem | AbiItem[], factory721Abi?: AbiItem | AbiItem[],
config?: Config config?: Config,
network?: string | number
) { ) {
this.factory721Address = factory721Address this.factory721Address = factory721Address
this.factory721Abi = factory721Abi || (defaultFactory721Abi.abi as AbiItem[]) this.factory721Abi = factory721Abi || (defaultFactory721Abi.abi as AbiItem[])
this.web3 = web3 this.web3 = web3
this.config = config || configHelperNetworks[0] this.config = config || new ConfigHelper().getConfig(network || 'unknown')
this.factory721 = setContractDefaults( this.factory721 = setContractDefaults(
new this.web3.eth.Contract(this.factory721Abi, this.factory721Address), new this.web3.eth.Contract(this.factory721Abi, this.factory721Address),
this.config this.config

View File

@ -3,7 +3,7 @@ import Web3 from 'web3'
import { TransactionReceipt } from 'web3-core' import { TransactionReceipt } from 'web3-core'
import { AbiItem } from 'web3-utils' import { AbiItem } from 'web3-utils'
import defaultRouter from '@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.json' 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 { Operation } from '../@types/Router'
import { Config } from '../models/index.js' import { Config } from '../models/index.js'
@ -28,12 +28,13 @@ export class Router {
routerAddress: string, routerAddress: string,
web3: Web3, web3: Web3,
RouterAbi?: AbiItem | AbiItem[], RouterAbi?: AbiItem | AbiItem[],
config?: Config config?: Config,
network?: string | number
) { ) {
this.routerAddress = routerAddress this.routerAddress = routerAddress
this.RouterAbi = RouterAbi || (defaultRouter.abi as AbiItem[]) this.RouterAbi = RouterAbi || (defaultRouter.abi as AbiItem[])
this.web3 = web3 this.web3 = web3
this.config = config || configHelperNetworks[0] this.config = config || new ConfigHelper().getConfig(network || 'unknown')
this.router = setContractDefaults( this.router = setContractDefaults(
new this.web3.eth.Contract(this.RouterAbi, this.routerAddress), new this.web3.eth.Contract(this.RouterAbi, this.routerAddress),
this.config this.config

View File

@ -4,11 +4,11 @@ import { TransactionReceipt } from 'web3-core'
import { Contract } from 'web3-eth-contract' import { Contract } from 'web3-eth-contract'
import { import {
getFairGasPrice, getFairGasPrice,
configHelperNetworks,
setContractDefaults, setContractDefaults,
unitsToAmount, unitsToAmount,
amountToUnits, amountToUnits,
LoggerInstance LoggerInstance,
ConfigHelper
} from '../../utils' } from '../../utils'
import BigNumber from 'bignumber.js' import BigNumber from 'bignumber.js'
import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json' import PoolTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/balancer/BPool.sol/BPool.json'
@ -40,11 +40,16 @@ export class Pool {
public GASLIMIT_DEFAULT = 1000000 public GASLIMIT_DEFAULT = 1000000
private config: Config 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 if (poolAbi) this.poolAbi = poolAbi
else this.poolAbi = PoolTemplate.abi as AbiItem[] else this.poolAbi = PoolTemplate.abi as AbiItem[]
this.web3 = web3 this.web3 = web3
this.config = config || configHelperNetworks[0] this.config = config || new ConfigHelper().getConfig(network || 'unknown')
} }
/** /**

View File

@ -7,8 +7,8 @@ import defaultDispenserAbi from '@oceanprotocol/contracts/artifacts/contracts/po
import { import {
LoggerInstance as logger, LoggerInstance as logger,
getFairGasPrice, getFairGasPrice,
configHelperNetworks, setContractDefaults,
setContractDefaults ConfigHelper
} from '../../utils/' } from '../../utils/'
import { Datatoken } from '../../tokens' import { Datatoken } from '../../tokens'
import { Config } from '../../models/index.js' import { Config } from '../../models/index.js'
@ -41,12 +41,13 @@ export class Dispenser {
web3: Web3, web3: Web3,
dispenserAddress: string = null, dispenserAddress: string = null,
dispenserAbi: AbiItem | AbiItem[] = null, dispenserAbi: AbiItem | AbiItem[] = null,
config?: Config config?: Config,
network?: string | number
) { ) {
this.web3 = web3 this.web3 = web3
this.dispenserAddress = dispenserAddress this.dispenserAddress = dispenserAddress
this.dispenserAbi = dispenserAbi || (defaultDispenserAbi.abi as AbiItem[]) this.dispenserAbi = dispenserAbi || (defaultDispenserAbi.abi as AbiItem[])
this.config = config || configHelperNetworks[0] this.config = config || new ConfigHelper().getConfig(network || 'unknown')
if (web3) if (web3)
this.dispenserContract = setContractDefaults( this.dispenserContract = setContractDefaults(
new this.web3.eth.Contract(this.dispenserAbi, this.dispenserAddress), new this.web3.eth.Contract(this.dispenserAbi, this.dispenserAddress),

View File

@ -6,11 +6,11 @@ import Web3 from 'web3'
import { import {
LoggerInstance, LoggerInstance,
getFairGasPrice, getFairGasPrice,
configHelperNetworks,
setContractDefaults, setContractDefaults,
amountToUnits, amountToUnits,
unitsToAmount, unitsToAmount,
ZERO_ADDRESS ZERO_ADDRESS,
ConfigHelper
} from '../../utils' } from '../../utils'
import { Config } from '../../models/index.js' import { Config } from '../../models/index.js'
import { PriceAndFees } from '../..' import { PriceAndFees } from '../..'
@ -77,10 +77,11 @@ export class FixedRateExchange {
fixedRateAddress: string, fixedRateAddress: string,
fixedRateExchangeAbi: AbiItem | AbiItem[] = null, fixedRateExchangeAbi: AbiItem | AbiItem[] = null,
oceanAddress: string = null, oceanAddress: string = null,
config?: Config config?: Config,
network?: string | number
) { ) {
this.web3 = web3 this.web3 = web3
this.config = config || configHelperNetworks[0] this.config = config || new ConfigHelper().getConfig(network || 'unknown')
this.fixedRateExchangeAbi = this.fixedRateExchangeAbi =
fixedRateExchangeAbi || (defaultFixedRateExchangeAbi.abi as AbiItem[]) fixedRateExchangeAbi || (defaultFixedRateExchangeAbi.abi as AbiItem[])
this.oceanAddress = oceanAddress this.oceanAddress = oceanAddress

View File

@ -2,7 +2,7 @@ import Web3 from 'web3'
import { AbiItem } from 'web3-utils/types' import { AbiItem } from 'web3-utils/types'
import { TransactionReceipt } from 'web3-core' import { TransactionReceipt } from 'web3-core'
import { Contract } from 'web3-eth-contract' import { Contract } from 'web3-eth-contract'
import { LoggerInstance, getFairGasPrice, configHelperNetworks } from '../../utils' import { LoggerInstance, getFairGasPrice, ConfigHelper } from '../../utils'
import BigNumber from 'bignumber.js' import BigNumber from 'bignumber.js'
import SideStakingTemplate from '@oceanprotocol/contracts/artifacts/contracts/pools/ssContracts/SideStaking.sol/SideStaking.json' 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' import defaultErc20Abi from '@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json'
@ -14,11 +14,16 @@ export class SideStaking {
public GASLIMIT_DEFAULT = 1000000 public GASLIMIT_DEFAULT = 1000000
public config: Config 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 if (ssAbi) this.ssAbi = ssAbi
else this.ssAbi = SideStakingTemplate.abi as AbiItem[] else this.ssAbi = SideStakingTemplate.abi as AbiItem[]
this.web3 = web3 this.web3 = web3
this.config = config || configHelperNetworks[0] this.config = config || new ConfigHelper().getConfig(network || 'unknown')
} }
async amountToUnits(token: string, amount: string): Promise<string> { async amountToUnits(token: string, amount: string): Promise<string> {

View File

@ -9,9 +9,9 @@ import {
LoggerInstance, LoggerInstance,
getFairGasPrice, getFairGasPrice,
setContractDefaults, setContractDefaults,
configHelperNetworks,
getFreOrderParams, getFreOrderParams,
ZERO_ADDRESS ZERO_ADDRESS,
ConfigHelper
} from '../utils' } from '../utils'
import { import {
ConsumeMarketFee, ConsumeMarketFee,
@ -63,13 +63,14 @@ export class Datatoken {
web3: Web3, web3: Web3,
datatokensAbi?: AbiItem | AbiItem[], datatokensAbi?: AbiItem | AbiItem[],
datatokensEnterpriseAbi?: AbiItem | AbiItem[], datatokensEnterpriseAbi?: AbiItem | AbiItem[],
config?: Config config?: Config,
network?: string | number
) { ) {
this.web3 = web3 this.web3 = web3
this.datatokensAbi = datatokensAbi || (defaultDatatokensAbi.abi as AbiItem[]) this.datatokensAbi = datatokensAbi || (defaultDatatokensAbi.abi as AbiItem[])
this.datatokensEnterpriseAbi = this.datatokensEnterpriseAbi =
datatokensEnterpriseAbi || (defaultDatatokensEnterpriseAbi.abi as AbiItem[]) datatokensEnterpriseAbi || (defaultDatatokensEnterpriseAbi.abi as AbiItem[])
this.config = config || configHelperNetworks[0] this.config = config || new ConfigHelper().getConfig(network || 'unknown')
this.nft = new Nft(this.web3) this.nft = new Nft(this.web3)
} }

View File

@ -7,7 +7,7 @@ import {
getFairGasPrice, getFairGasPrice,
generateDtName, generateDtName,
setContractDefaults, setContractDefaults,
configHelperNetworks ConfigHelper
} from '../utils' } from '../utils'
import { Contract } from 'web3-eth-contract' import { Contract } from 'web3-eth-contract'
import { MetadataProof } from '../../src/@types' import { MetadataProof } from '../../src/@types'
@ -33,10 +33,15 @@ export class Nft {
public startBlock: number public startBlock: number
public config: Config 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.nftAbi = nftAbi || (defaultNftAbi.abi as AbiItem[])
this.web3 = web3 this.web3 = web3
this.config = config || configHelperNetworks[0] this.config = config || new ConfigHelper().getConfig(network || 'unknown')
} }
/** /**