Skip to content

Commit a56367c

Browse files
committed
Merge branch 'main' into remove-sentry
2 parents 07365a8 + e24ff37 commit a56367c

File tree

4 files changed

+2
-116
lines changed

4 files changed

+2
-116
lines changed

observer/bin/dry-run.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ethers } from 'ethers'
33
import assert from 'node:assert'
44

55
import { RPC_URL, rpcHeaders } from '../lib/config.js'
6-
import { observeTransferEvents, observeScheduledRewards, observeRetrievalResultCodes, observeYesterdayDesktopUsers } from '../lib/observer.js'
6+
import { observeTransferEvents, observeRetrievalResultCodes, observeYesterdayDesktopUsers } from '../lib/observer.js'
77
import { createInflux } from '../lib/telemetry.js'
88
import { getPgPools } from '@filecoin-station/spark-stats-db'
99

@@ -25,7 +25,6 @@ await pgPools.stats.query('DELETE FROM daily_reward_transfers')
2525

2626
await Promise.all([
2727
observeTransferEvents(pgPools.stats, ieContract, provider),
28-
observeScheduledRewards(pgPools, ieContract),
2928
observeRetrievalResultCodes(pgPools.stats, influxQueryApi),
3029
observeYesterdayDesktopUsers(pgPools.stats, influxQueryApi)
3130
])

observer/bin/spark-observer.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { RPC_URL, rpcHeaders } from '../lib/config.js'
99
import { getPgPools } from '@filecoin-station/spark-stats-db'
1010
import {
1111
observeTransferEvents,
12-
observeScheduledRewards,
1312
observeRetrievalResultCodes,
1413
observeYesterdayDesktopUsers
1514
} from '../lib/observer.js'
@@ -60,11 +59,6 @@ await Promise.all([
6059
() => observeTransferEvents(pgPools.stats, ieContract, provider),
6160
ONE_HOUR
6261
),
63-
loop(
64-
'Scheduled rewards',
65-
() => observeScheduledRewards(pgPools, ieContract),
66-
24 * ONE_HOUR
67-
),
6862
loop(
6963
'Retrieval result codes',
7064
() => observeRetrievalResultCodes(pgPools.stats, influxQueryApi),

observer/lib/observer.js

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { updateDailyTransferStats } from './platform-stats.js'
2-
import assert from 'node:assert'
32

43
/**
54
* Observe the transfer events on the Filecoin blockchain
@@ -35,58 +34,6 @@ export const observeTransferEvents = async (pgPoolStats, ieContract, provider) =
3534
return events.length
3635
}
3736

38-
const getScheduledRewards = async (address, ieContract, fetch) => {
39-
const [fromContract, fromSparkRewards] = await Promise.all([
40-
ieContract.rewardsScheduledFor(address),
41-
(async () => {
42-
const res = await fetch(
43-
`https://spark-rewards.fly.dev/scheduled-rewards/${address}`
44-
)
45-
const json = await res.json()
46-
assert(typeof json === 'string')
47-
return BigInt(json)
48-
})()
49-
])
50-
return fromContract + fromSparkRewards
51-
}
52-
53-
/**
54-
* Observe scheduled rewards from blockchain and `spark-rewards`
55-
* @param {import('@filecoin-station/spark-stats-db').PgPools} pgPools
56-
* @param {import('ethers').Contract} ieContract
57-
* @param {typeof globalThis.fetch} [fetch]
58-
*/
59-
export const observeScheduledRewards = async (pgPools, ieContract, fetch = globalThis.fetch) => {
60-
console.log('Querying scheduled rewards from impact evaluator')
61-
const { rows } = await pgPools.evaluate.query(`
62-
SELECT participant_address
63-
FROM participants p
64-
JOIN daily_participants d ON p.id = d.participant_id
65-
WHERE d.day >= now() - interval '3 days'
66-
`)
67-
for (const { participant_address: address } of rows) {
68-
let scheduledRewards
69-
try {
70-
scheduledRewards = await getScheduledRewards(address, ieContract, fetch)
71-
} catch (err) {
72-
console.error(
73-
'Error querying scheduled rewards for',
74-
address,
75-
{ cause: err }
76-
)
77-
continue
78-
}
79-
console.log('Scheduled rewards for', address, scheduledRewards)
80-
await pgPools.stats.query(`
81-
INSERT INTO daily_scheduled_rewards
82-
(day, participant_address, scheduled_rewards)
83-
VALUES (now(), $1, $2)
84-
ON CONFLICT (day, participant_address) DO UPDATE SET
85-
scheduled_rewards = EXCLUDED.scheduled_rewards
86-
`, [address, scheduledRewards])
87-
}
88-
}
89-
9037
/**
9138
* @param {import('ethers').Log | import('ethers').EventLog} logOrEventLog
9239
* @returns {logOrEventLog is import('ethers').EventLog}

observer/test/observer.test.js

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import assert from 'node:assert'
22
import { beforeEach, describe, it } from 'mocha'
33
import { getPgPools } from '@filecoin-station/spark-stats-db'
4-
import { givenDailyParticipants } from '@filecoin-station/spark-stats-db/test-helpers.js'
54

6-
import { observeTransferEvents, observeScheduledRewards, observeRetrievalResultCodes, observeYesterdayDesktopUsers } from '../lib/observer.js'
5+
import { observeTransferEvents, observeRetrievalResultCodes, observeYesterdayDesktopUsers } from '../lib/observer.js'
76

87
describe('observer', () => {
98
let pgPools
@@ -133,59 +132,6 @@ describe('observer', () => {
133132
})
134133
})
135134

136-
describe('observeScheduledRewards', () => {
137-
beforeEach(async () => {
138-
await pgPools.evaluate.query('DELETE FROM recent_station_details')
139-
await pgPools.evaluate.query('DELETE FROM recent_participant_subnets')
140-
await pgPools.evaluate.query('DELETE FROM daily_participants')
141-
await pgPools.evaluate.query('DELETE FROM participants')
142-
await pgPools.stats.query('DELETE FROM daily_scheduled_rewards')
143-
await givenDailyParticipants(pgPools.evaluate, today(), ['0xCURRENT'])
144-
await givenDailyParticipants(pgPools.evaluate, '2000-01-01', ['0xOLD'])
145-
})
146-
147-
it('observes scheduled rewards', async () => {
148-
/** @type {any} */
149-
const ieContract = {
150-
rewardsScheduledFor: async (address) => {
151-
if (address === '0xCURRENT') {
152-
return 100n
153-
} else {
154-
throw new Error('Should never be called')
155-
}
156-
}
157-
}
158-
const fetchMock = async url => {
159-
assert.strictEqual(url, 'https://spark-rewards.fly.dev/scheduled-rewards/0xCURRENT')
160-
return new Response(JSON.stringify('10'))
161-
}
162-
await observeScheduledRewards(pgPools, ieContract, fetchMock)
163-
const { rows } = await pgPools.stats.query(`
164-
SELECT participant_address, scheduled_rewards
165-
FROM daily_scheduled_rewards
166-
`)
167-
assert.deepStrictEqual(rows, [{
168-
participant_address: '0xCURRENT',
169-
scheduled_rewards: '110'
170-
}])
171-
})
172-
it('updates scheduled rewards', async () => {
173-
/** @type {any} */
174-
const ieContract = {
175-
rewardsScheduledFor: async () => 200n
176-
}
177-
await observeScheduledRewards(pgPools, ieContract)
178-
const { rows } = await pgPools.stats.query(`
179-
SELECT participant_address, scheduled_rewards
180-
FROM daily_scheduled_rewards
181-
`)
182-
assert.deepStrictEqual(rows, [{
183-
participant_address: '0xCURRENT',
184-
scheduled_rewards: '200'
185-
}])
186-
})
187-
})
188-
189135
describe('observeRetrievalResultCodes', () => {
190136
beforeEach(async () => {
191137
await pgPools.stats.query('DELETE FROM daily_retrieval_result_codes')

0 commit comments

Comments
 (0)