diff --git a/src/balancer/OceanPool.ts b/src/balancer/OceanPool.ts index b60f0ad3..64790f5a 100644 --- a/src/balancer/OceanPool.ts +++ b/src/balancer/OceanPool.ts @@ -118,28 +118,36 @@ export class OceanPool extends Pool { const address = createTxid.events.BPoolRegistered.returnValues[0] const oceanWeight = 10 - parseFloat(dtWeight) this.dtAddress = dtAddress - observer.next(PoolCreateProgressStep.ApprovingDatatoken) let txid - txid = await this.approve( - account, - dtAddress, - address, - this.web3.utils.toWei(String(dtAmount)) - ) - if (!txid) { - this.logger.error('ERROR: Failed to call approve DT token') - return null + let dtAllowance + dtAllowance = await this.allowance(dtAddress, account, address) + if (dtAllowance < dtAmount){ + observer.next(PoolCreateProgressStep.ApprovingDatatoken) + txid = await this.approve( + account, + dtAddress, + address, + this.web3.utils.toWei(String(dtAmount)) + ) + if (!txid) { + this.logger.error('ERROR: Failed to call approve DT token') + return null + } } - observer.next(PoolCreateProgressStep.ApprovingOcean) - txid = await this.approve( - account, - this.oceanAddress, - address, - this.web3.utils.toWei(String(oceanAmount)) - ) - if (!txid) { - this.logger.error('ERROR: Failed to call approve OCEAN token') - return null + let oceanAllowance + oceanAllowance = await this.allowance(dtAddress, account, address) + if (oceanAllowance < oceanAmount){ + observer.next(PoolCreateProgressStep.ApprovingOcean) + txid = await this.approve( + account, + this.oceanAddress, + address, + this.web3.utils.toWei(String(oceanAmount)) + ) + if (!txid) { + this.logger.error('ERROR: Failed to call approve OCEAN token') + return null + } } observer.next(PoolCreateProgressStep.SetupPool) txid = await super.setup( diff --git a/src/balancer/Pool.ts b/src/balancer/Pool.ts index a9988417..82a64dfd 100644 --- a/src/balancer/Pool.ts +++ b/src/balancer/Pool.ts @@ -4,6 +4,7 @@ import { TransactionReceipt } from 'web3-core' import { Logger, getFairGasPrice } from '../utils' import BigNumber from 'bignumber.js' import jsonpoolABI from '@oceanprotocol/contracts/artifacts/BPool.json' +import defaultDatatokensABI from '@oceanprotocol/contracts/artifacts/DataTokenTemplate.json' import { PoolFactory } from './PoolFactory' const MaxUint256 = @@ -107,6 +108,25 @@ export class Pool extends PoolFactory { return result } + /** + * Get Alloance for both DataToken and Ocean + * @param {String } tokenAdress + * @param {String} owner + * @param {String} spender + */ + public async allowance( + tokenAdress: string, + owner: string, + spender: string + ): Promise { + const tokenAbi = (defaultDatatokensABI.abi as AbiItem[]) + const datatoken = new this.web3.eth.Contract(tokenAbi, tokenAdress, { + from: spender + }) + const trxReceipt = await datatoken.methods.allowance(owner, spender).call() + return this.web3.utils.fromWei(trxReceipt) + } + /** * Approve spender to spent amount tokens * @param {String} account