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

Browse Source 
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
This commit is contained in:
mihaisc 2020-11-12 20:38:45 +02:00
parent be33814f61
commit eb5c29810f
No known key found for this signature in database
GPG Key ID: 4FB0C2329B4C6E29
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/balancer/OceanPool.ts
View File

@ -958,7 +958,6 @@ export class OceanPool extends Pool {
public async getPoolSharesByAddress(account: string): Promise<PoolShare[]> { public async getPoolSharesByAddress(account: string): Promise<PoolShare[]> {
const result: PoolShare[] = [] const result: PoolShare[] = []
const factory = new this.web3.eth.Contract(this.factoryABI, this.factoryAddress) const factory = new this.web3.eth.Contract(this.factoryABI, this.factoryAddress)
const events = await factory.getPastEvents('BPoolRegistered', { const events = await factory.getPastEvents('BPoolRegistered', {
filter: {}, filter: {},
fromBlock: this.startBlock, fromBlock: this.startBlock,
@ -982,7 +981,11 @@ export class OceanPool extends Pool {
} }
promises = [] promises = []
} }
return result
const filteredResult = result.filter((share) => {
return share !== undefined
})
return filteredResult
} }
/** /**
@ -1056,7 +1059,10 @@ export class OceanPool extends Pool {
// break // break
// } // }
// } // }
return results const eventResults = results.filter((share) => {
return share !== undefined
})
return eventResults
} }
/** /**
@ -1065,14 +1071,14 @@ export class OceanPool extends Pool {
* @return {PoolTransaction[]} * @return {PoolTransaction[]}
*/ */
public async getAllPoolLogs(account: string): Promise<PoolTransaction[]> { public async getAllPoolLogs(account: string): Promise<PoolTransaction[]> {
const results: PoolTransaction[] = [] const results: PoolTransaction[][] = []
const factory = new this.web3.eth.Contract(this.factoryABI, this.factoryAddress) const factory = new this.web3.eth.Contract(this.factoryABI, this.factoryAddress)
const events = await factory.getPastEvents('BPoolRegistered', { const events = await factory.getPastEvents('BPoolRegistered', {
filter: {}, filter: {},
fromBlock: this.startBlock, fromBlock: this.startBlock,
toBlock: 'latest' toBlock: 'latest'
}) })
// since getPoolLogs returns an array we have to push [j][k]
let promises = [] let promises = []
for (let i = 0; i < events.length; i++) { for (let i = 0; i < events.length; i++) {
promises.push( promises.push(
@ -1081,7 +1087,7 @@ export class OceanPool extends Pool {
if (promises.length > MAX_AWAIT_PROMISES) { if (promises.length > MAX_AWAIT_PROMISES) {
const data = await Promise.all(promises) const data = await Promise.all(promises)
for (let j = 0; j < data.length; j++) { for (let j = 0; j < data.length; j++) {
for (let k = 0; k < data.length; k++) results.push(data[j][k]) results.push(data[j])
} }
promises = [] promises = []
} }
@ -1089,12 +1095,14 @@ export class OceanPool extends Pool {
if (promises.length > 0) { if (promises.length > 0) {
const data = await Promise.all(promises) const data = await Promise.all(promises)
for (let j = 0; j < data.length; j++) { for (let j = 0; j < data.length; j++) {
for (let k = 0; k < data.length; k++) results.push(data[j][k]) results.push(data[j])
} }
promises = [] promises = []
} }
return results const concatResults = results.reduce((elem1, elem2) => elem1.concat(elem2))
return concatResults
} }
private async getEventData( private async getEventData(