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

Merge pull request #432 from oceanprotocol/optimise/get_pool_logs

Browse Source 
use event block number as start
This commit is contained in:
Matthias Kretschmann 2020-10-30 13:55:25 +01:00 committed by GitHub
commit bf334ce5da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/balancer/OceanPool.ts
View File

@ -906,7 +906,6 @@ export class OceanPool extends Pool {
fromBlock: BPFACTORY_DEPLOY_BLOCK, fromBlock: BPFACTORY_DEPLOY_BLOCK,
toBlock: 'latest' toBlock: 'latest'
}) })
for (let i = 0; i < events.length; i++) { for (let i = 0; i < events.length; i++) {
if (!account || events[i].returnValues[1].toLowerCase() === account.toLowerCase()) if (!account || events[i].returnValues[1].toLowerCase() === account.toLowerCase())
result.push(await this.getPoolDetails(events[i].returnValues[0])) result.push(await this.getPoolDetails(events[i].returnValues[0]))
@ -928,7 +927,6 @@ export class OceanPool extends Pool {
fromBlock: BPFACTORY_DEPLOY_BLOCK, fromBlock: BPFACTORY_DEPLOY_BLOCK,
toBlock: 'latest' toBlock: 'latest'
}) })
for (let i = 0; i < events.length; i++) { for (let i = 0; i < events.length; i++) {
const shares = await super.sharesBalance(account, events[i].returnValues[0]) const shares = await super.sharesBalance(account, events[i].returnValues[0])
if (parseFloat(shares) > 0) { if (parseFloat(shares) > 0) {
@ -965,6 +963,7 @@ export class OceanPool extends Pool {
*/ */
public async getPoolLogs( public async getPoolLogs(
poolAddress: string, poolAddress: string,
startBlock = 0,
account?: string account?: string
): Promise<PoolTransaction[]> { ): Promise<PoolTransaction[]> {
const results: PoolTransaction[] = [] const results: PoolTransaction[] = []
@ -975,7 +974,7 @@ export class OceanPool extends Pool {
events = await pool.getPastEvents('LOG_SWAP', { events = await pool.getPastEvents('LOG_SWAP', {
filter, filter,
fromBlock: BPFACTORY_DEPLOY_BLOCK, fromBlock: startBlock,
toBlock: 'latest' toBlock: 'latest'
}) })
@ -986,7 +985,7 @@ export class OceanPool extends Pool {
events = await pool.getPastEvents('LOG_JOIN', { events = await pool.getPastEvents('LOG_JOIN', {
filter, filter,
fromBlock: BPFACTORY_DEPLOY_BLOCK, fromBlock: startBlock,
toBlock: 'latest' toBlock: 'latest'
}) })
@ -997,7 +996,7 @@ export class OceanPool extends Pool {
events = await pool.getPastEvents('LOG_EXIT', { events = await pool.getPastEvents('LOG_EXIT', {
filter, filter,
fromBlock: BPFACTORY_DEPLOY_BLOCK, fromBlock: startBlock,
toBlock: 'latest' toBlock: 'latest'
}) })
for (let i = 0; i < events.length; i++) { for (let i = 0; i < events.length; i++) {
@ -1021,9 +1020,12 @@ export class OceanPool extends Pool {
fromBlock: BPFACTORY_DEPLOY_BLOCK, fromBlock: BPFACTORY_DEPLOY_BLOCK,
toBlock: 'latest' toBlock: 'latest'
}) })
for (let i = 0; i < events.length; i++) { for (let i = 0; i < events.length; i++) {
const logs = await this.getPoolLogs(events[i].returnValues[0], account) const logs = await this.getPoolLogs(
events[i].returnValues[0],
events[i].blockNumber,
account
)
for (let j = 0; j < logs.length; j++) results.push(logs[j]) for (let j = 0; j < logs.length; j++) results.push(logs[j])
} }
return results return results