diff --git a/src/balancer/Pool.ts b/src/balancer/Pool.ts index 083dcca2..f2103dd9 100644 --- a/src/balancer/Pool.ts +++ b/src/balancer/Pool.ts @@ -1,7 +1,7 @@ import Web3 from 'web3' import { AbiItem } from 'web3-utils/types' import Decimal from 'decimal.js' -import * as jsonpoolABI from '@oceanprotocol/contracts/artifacts/SPool.json' +import jsonpoolABI from '@oceanprotocol/contracts/artifacts/SPool.json' import { PoolFactory } from './PoolFactory' /** @@ -25,7 +25,7 @@ export class Pool extends PoolFactory { ) { super(web3, factoryABI, factoryAddress, gaslimit) if (poolABI) this.poolABI = poolABI - else this.poolABI = jsonpoolABI.abi + else this.poolABI = jsonpoolABI.abi as AbiItem[] } /** @@ -73,7 +73,7 @@ export class Pool extends PoolFactory { stateMutability: 'nonpayable', type: 'function' } - ] + ] as AbiItem[] const token = new this.web3.eth.Contract(minABI, tokenAddress, { from: account }) @@ -115,7 +115,7 @@ export class Pool extends PoolFactory { stateMutability: 'view', type: 'function' } - ] + ] as AbiItem[] const token = new this.web3.eth.Contract(minABI, poolAddress, { from: account }) @@ -155,7 +155,7 @@ export class Pool extends PoolFactory { account, token.address, poolAddress, - this.web3.utils.toWei(token.amount) + this.web3.utils.toWei(token.amount) as any ) await pool.methods .bind( diff --git a/src/balancer/PoolFactory.ts b/src/balancer/PoolFactory.ts index 73243bc5..c7c77c70 100644 --- a/src/balancer/PoolFactory.ts +++ b/src/balancer/PoolFactory.ts @@ -1,6 +1,6 @@ import Web3 from 'web3' import { AbiItem } from 'web3-utils/types' -import * as jsonFactoryABI from '@oceanprotocol/contracts/artifacts/SFactory.json' +import jsonFactoryABI from '@oceanprotocol/contracts/artifacts/SFactory.json' export class PoolFactory { public GASLIMIT_DEFAULT = 5000000 @@ -17,7 +17,7 @@ export class PoolFactory { this.web3 = web3 if (factoryABI) this.factoryABI = factoryABI - else this.factoryABI = jsonFactoryABI.abi + else this.factoryABI = jsonFactoryABI.abi as AbiItem[] if (factoryAddress) { this.factoryAddress = factoryAddress } diff --git a/src/datatokens/Datatokens.ts b/src/datatokens/Datatokens.ts index f6305da8..f669adb6 100644 --- a/src/datatokens/Datatokens.ts +++ b/src/datatokens/Datatokens.ts @@ -28,8 +28,8 @@ export class DataTokens { web3: Web3 ) { this.factoryAddress = factoryAddress - this.factoryABI = factoryABI || defaultFactoryABI.abi - this.datatokensABI = datatokensABI || defaultDatatokensABI.abi + this.factoryABI = factoryABI || (defaultFactoryABI.abi as AbiItem[]) + this.datatokensABI = datatokensABI || (defaultDatatokensABI.abi as AbiItem[]) this.web3 = web3 }