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

fix DTPrice if amount is too high

Browse Source
This commit is contained in:
alexcos20 2020-10-30 04:09:12 -07:00
parent 0a0ce63580
commit 336054a663
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/balancer/OceanPool.ts
View File

@ -840,7 +840,7 @@ export class OceanPool extends Pool {
public async getDTPrice(poolAddress: string): Promise<string> { public async getDTPrice(poolAddress: string): Promise<string> {
if (this.oceanAddress == null) { if (this.oceanAddress == null) {
this.logger.error('ERROR: oceanAddress is not defined') this.logger.error('ERROR: oceanAddress is not defined')
return null return '0'
} }
return this.getOceanNeeded(poolAddress, '1') return this.getOceanNeeded(poolAddress, '1')
} }
@ -868,6 +868,11 @@ export class OceanPool extends Pool {
public async getOceanNeeded(poolAddress: string, dtRequired: string): Promise<string> { public async getOceanNeeded(poolAddress: string, dtRequired: string): Promise<string> {
const dtAddress = await this.getDTAddress(poolAddress) const dtAddress = await this.getDTAddress(poolAddress)
if (
parseFloat(dtRequired) > parseFloat(await this.getDTMaxBuyQuantity(poolAddress))
) {
return '0'
}
return this.calcInGivenOut(poolAddress, this.oceanAddress, dtAddress, dtRequired) return this.calcInGivenOut(poolAddress, this.oceanAddress, dtAddress, dtRequired)
} }
@ -878,6 +883,12 @@ export class OceanPool extends Pool {
public async getDTNeeded(poolAddress: string, OceanRequired: string): Promise<string> { public async getDTNeeded(poolAddress: string, OceanRequired: string): Promise<string> {
const dtAddress = await this.getDTAddress(poolAddress) const dtAddress = await this.getDTAddress(poolAddress)
if (
parseFloat(OceanRequired) >
parseFloat(await this.getOceanMaxBuyQuantity(poolAddress))
) {
return '0'
}
return this.calcInGivenOut(poolAddress, dtAddress, this.oceanAddress, OceanRequired) return this.calcInGivenOut(poolAddress, dtAddress, this.oceanAddress, OceanRequired)
} }

2
test/unit/balancer/Balancer.test.ts
View File

@ -195,7 +195,7 @@ describe('Balancer flow', () => {
alicePoolAddress, alicePoolAddress,
await Pool.getDTReserve(alicePoolAddress) await Pool.getDTReserve(alicePoolAddress)
) )
assert(requiredOcean === null) assert(requiredOcean === '0')
}) })
it('Get amount of Ocean needed to buy 1 dtToken', async () => { it('Get amount of Ocean needed to buy 1 dtToken', async () => {
const requiredOcean = await Pool.getOceanNeeded(alicePoolAddress, '1') const requiredOcean = await Pool.getOceanNeeded(alicePoolAddress, '1')