diff --git a/src/App/IQHolders/IQHolder.service.ts b/src/App/IQHolders/IQHolder.service.ts index b4f7d0b3..33ddba3b 100644 --- a/src/App/IQHolders/IQHolder.service.ts +++ b/src/App/IQHolders/IQHolder.service.ts @@ -194,11 +194,11 @@ class IQHolderService { const startTimestamp = 1616112000 const endTimestamp = startTimestamp + oneDayInSeconds const key = this.etherScanApiKey() - const rootUrl = `https://api${ - this.provider().includes('mainnet') ? '' : '-goerli' - }` + const mainnet = this.provider().includes('mainnet') const buildUrl = (fallbackTimestamp: number, timestamp?: number) => - `${rootUrl}.etherscan.io/api?module=block&action=getblocknobytime×tamp=${ + `https://api.etherscan.io/api?${ + !mainnet && 'chainid=11155111' + }module=block&action=getblocknobytime×tamp=${ timestamp || fallbackTimestamp }&closest=before&apikey=${key}` @@ -215,7 +215,9 @@ class IQHolderService { } catch (e: any) { console.error('Error requesting block number', e.data) } - const transactionsFor1Day = `${rootUrl}.etherscan.io/api?module=account&action=txlist&address=${IQContract}&startBlock=${blockNumberForQuery1}&endBlock=${blockNumberForQuery2}&page=1&offset=1000&sort=asc&apikey=${key}` + const transactionsFor1Day = `https://api.etherscan.io/api?${ + !mainnet && 'chainid=11155111' + }module=account&action=txlist&address=${IQContract}&startBlock=${blockNumberForQuery1}&endBlock=${blockNumberForQuery2}&page=1&offset=1000&sort=asc&apikey=${key}` let transactions try { diff --git a/src/App/StakedIQ/stakedIQ.service.ts b/src/App/StakedIQ/stakedIQ.service.ts index 3c71a0ce..d67078a0 100644 --- a/src/App/StakedIQ/stakedIQ.service.ts +++ b/src/App/StakedIQ/stakedIQ.service.ts @@ -11,7 +11,7 @@ import { existRecord, stopJob, getDates, insertOldData } from './stakedIQ.utils' @Injectable() class StakedIQService { constructor( - private repo: StakedIQRepository, + private repo: StakedIQRepository, private configService: ConfigService, private httpService: HttpService, private schedulerRegistry: SchedulerRegistry, @@ -76,9 +76,10 @@ class StakedIQService { const { time, incomingDate } = await getDates(this.repo) const key = this.etherScanApiKey() - const url = `https://api${ - this.provider().includes('mainnet') ? '' : '-goerli' - }.etherscan.io/api?module=block&action=getblocknobytime×tamp=${time}&closest=before&apikey=${key}` + const mainnet = this.provider().includes('mainnet') + const url = `https://api.etherscan.io/api?${ + !mainnet && 'chainid=11155111' + }module=block&action=getblocknobytime×tamp=${time}&closest=before&apikey=${key}` let blockNumberForQuery try {